时间标签的添加

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

@@ -1,5 +1,6 @@
 package com.hssx.cloudmodel.entity.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import lombok.Data;
 
@@ -16,4 +17,14 @@ public class MouldEquipmentVO extends MouldEquipment {
     private String emergencyContent;//告警内容
     private String area;//所在科室
     private String planType;//计划类型
+    /**
+     * 模具编号
+     */
+    private String modelNo;
+
+    /**
+     * 模具名称
+     */
+    private String modelName;
+
 }

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

@@ -20,5 +20,5 @@ public interface MouldEquipmentMapper extends BaseMapper<MouldEquipment> {
 
     List<MouldEquipmentVO> getListByCompanyId(@Param("belongCompanyId") Integer belongCompanyId,@Param("list") List<Integer> ides);
 
-    List<MouldEquipment> getList();
+    List<MouldEquipmentVO> getList();
 }

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

@@ -90,8 +90,8 @@ 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.getList();
-                PageInfo<MouldEquipment> pageInfo = new PageInfo<>(mouldEquipments);
+                List<MouldEquipmentVO> mouldEquipments = mouldEquipmentMapper.getList();
+                PageInfo<MouldEquipmentVO> pageInfo = new PageInfo<>(mouldEquipments);
                 msg.data = pageInfo;
             } else {
                 msg.setError("对不起！您不含有查看该列表的权利。");

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

@@ -109,8 +109,6 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public HttpRespMsg addAndUpdateUser(User user, Integer flag) {
         //获取该账号的创建者
         User parentUser = userMapper.selectById(user.getParentId());
-        //获取admin的用户信息
-        User proParentUser = userMapper.selectById(parentUser.getParentId());
         HttpRespMsg msg = new HttpRespMsg();
         if (flag == 0) {
             //添加角色
@@ -123,7 +121,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 UserCompany userCompany = new UserCompany();
                 userCompany.setUserId(existingUser.getId());
                 userCompany.setBelongCompanyId(existingUser.getCompanyId());
-                userCompany.setCooperationCompanyId(proParentUser.getCompanyId());
+                userCompany.setCooperationCompanyId(existingUser.getCompanyId());
                 QueryWrapper<UserCompany> qWra = new QueryWrapper<>(userCompany);
                 int userCompanyCount = userCompanyMapper.selectCount(qWra);
                 if (count == 0) {
@@ -146,7 +144,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 UserCompany userCompany = new UserCompany();
                 userCompany.setUserId(user.getId());
                 userCompany.setBelongCompanyId(user.getCompanyId());
-                userCompany.setCooperationCompanyId(proParentUser.getCompanyId());
+                userCompany.setCooperationCompanyId(parentUser.getCompanyId());
                 QueryWrapper<UserCompany> qWra = new QueryWrapper<>(userCompany);
                 int userCompanyCount = userCompanyMapper.selectCount(qWra);
                 if (count == 0) {

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

@@ -8,4 +8,16 @@ package com.hssx.cloudmodel.util;
  */
 public class NewsNoticeTemplate {
 
+    //模具文档审批消息模板
+    public static String approvalMessage(String username){
+        return "模具开发人员:"+username+"已上传成功，待您审批！";
+    }
+//    //模具保养消息模板
+//    public static String approvalMessage(String username){
+//        return "模具开发人员:"+username+"已上传成功，待您审批！";
+//    }
+//    //模具文档审批消息模板
+//    public static String approvalMessage(String username){
+//        return "模具开发人员:"+username+"已上传成功，待您审批！";
+//    }
 }

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

@@ -25,6 +25,8 @@
         <result column="equipment_no" property="equipmentNo" />
         <result column="is_use" property="isUse" />
         <result column="hill_number" property="hillNumber" />
+        <result column="modelNo" property="modelNo" />
+        <result column="modelName" property="modelName" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
@@ -57,9 +59,12 @@
         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
+          tbme.is_use, tbme.hill_number,tbc.company_name companyName,tbm.model_no modelNo,tbm.model_name modelName
         from
           tb_mould_equipment tbme
+        left join
+          tb_mould tbm
+        on tbme.id = tbm.equipment_id
         left join
           tb_company tbc
         on