소스 검색

用户创建的修改

5 년 전
부모
커밋
b5c5ce500d

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

@@ -51,6 +51,8 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
     ProjectMapper projectMapper;
     @Resource
     ProjectApproveMapper projectApproveMapper;
+    @Resource
+    CustomCompanyMapper customCompanyMapper;
 
     @Override
     public HttpRespMsg addAndUpdateMould(Mould mould, User user) {
@@ -91,6 +93,8 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             map.put("view", 0);
             map.put("approve", 0);
         } else {
+            List<CustomCompany> list = customCompanyMapper.selectList(new QueryWrapper<CustomCompany>().eq("project_id",mould.getProjectId()));
+            map.put("customCompany",list);
             if (Constant.SYS_PARENT_ID == currentUser.getParentId()) {
                 //当前人超级管理员 ,对项目只可以浏览
                 map.put("update", 0);

+ 1 - 0
cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -152,6 +152,7 @@
 
     <select id="getDetailById" resultMap="BaseResultMapVO">
     select
+        tbm.project_id project_id, tbm.setting_life setting_life, tbm.area area,
         tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,tbp.manager_id managerId,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbco.company_name produceCompany,tbm.creator_id creator_id,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbm.rfid rfid,tbm.oc_cycle oc_cycle,