From c89ca4524fa8311ebb415a2f225d2f95da780603 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 03 三月 2025 11:23:53 +0800
Subject: [PATCH] 车间选择列表
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java | 10 ++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java | 11 +++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java | 9 +++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java | 14 ++++++++++++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml | 11 +++++++++++
5 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
index 7d2a24c..3697b01 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcWorkshopInfoController.java
@@ -23,6 +23,7 @@
import org.jeecg.modules.mdc.service.IMdcWorkshopInfoService;
import org.jeecg.modules.mdc.vo.MdcWorkshopEquipmentVo;
import org.jeecg.modules.mdc.vo.WorkshopEquipmentVo;
+import org.jeecg.modules.system.entity.MdcProduction;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -292,4 +293,17 @@
}
}
+ /**
+ * 鏌ヨ杞﹂棿
+ */
+ @AutoLog(value = "澶у睆杞﹂棿淇℃伅-鏌ヨ杞﹂棿")
+ @ApiOperation(value = "澶у睆杞﹂棿淇℃伅-鏌ヨ杞﹂棿", notes = "澶у睆杞﹂棿淇℃伅-鏌ヨ杞﹂棿")
+ @GetMapping(value = "/getProductionList")
+ public Result<List<MdcProduction>> getProductionList() {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ String userId = user.getId();
+ List<MdcProduction> list = mdcWorkshopInfoService.productionListByUser(userId);
+ return Result.OK(list);
+ }
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
index 70fbff3..80aeb93 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcWorkshopInfoMapper.java
@@ -5,6 +5,7 @@
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcWorkshopInfo;
+import org.jeecg.modules.system.entity.MdcProduction;
import java.util.List;
@@ -31,4 +32,12 @@
* @return
*/
List<MdcWorkshopInfo> listByUser(@Param("userId") String userId);
+
+ /**
+ * 鏌ヨ杞﹂棿
+ *
+ * @param userId
+ * @return
+ */
+ List<MdcProduction> productionListByUser(@Param("userId") String userId);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
index b41f8da..a553cd3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcWorkshopInfoMapper.xml
@@ -38,4 +38,15 @@
WHERE
t5.user_id = #{ userId }
</select>
+
+ <select id="productionListByUser" resultType="org.jeecg.modules.system.entity.MdcProduction">
+ SELECT
+ t1.*
+ FROM
+ mdc_production t1
+ LEFT JOIN mdc_user_production t2 ON t1.id = t2.pro_id
+ WHERE
+ t1.org_type = 2 AND t2.user_id = #{userId}
+ ORDER BY t1.production_name
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
index 5bfd91e..9b501e0 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcWorkshopInfoService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mdc.dto.MdcBigScreenEquipmentDto;
import org.jeecg.modules.mdc.entity.MdcWorkshopInfo;
+import org.jeecg.modules.system.entity.MdcProduction;
import java.util.List;
@@ -22,8 +23,17 @@
/**
* 杞﹂棿澶у睆鍒楄〃
+ *
* @param userId
* @return
*/
List<MdcWorkshopInfo> listByUser(String userId);
+
+ /**
+ * 鏌ヨ杞﹂棿
+ *
+ * @param userId
+ * @return
+ */
+ List<MdcProduction> productionListByUser(String userId);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
index 6e7b036..2231207 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcWorkshopInfoServiceImpl.java
@@ -6,6 +6,7 @@
import org.jeecg.modules.mdc.entity.MdcWorkshopInfo;
import org.jeecg.modules.mdc.mapper.MdcWorkshopInfoMapper;
import org.jeecg.modules.mdc.service.IMdcWorkshopInfoService;
+import org.jeecg.modules.system.entity.MdcProduction;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -38,4 +39,14 @@
public List<MdcWorkshopInfo> listByUser(String userId) {
return this.baseMapper.listByUser(userId);
}
+
+ /**
+ * 鏌ヨ杞﹂棿
+ * @param userId
+ * @return
+ */
+ @Override
+ public List<MdcProduction> productionListByUser(String userId) {
+ return this.baseMapper.productionListByUser(userId);
+ }
}
--
Gitblit v1.9.3