Merge remote-tracking branch 'origin/feature_zhujian' into feature_zhujian

data-ui/src/views/data/housingconstruction/car/index.vue

@@ -128,7 +128,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="企业" prop="enterpriseId">
-              <el-select v-model="form.enterpriseId" filterable placeholder="请选择企业名称">
+              <el-select v-model="form.enterpriseId" @change="onSelectChange(form.enterpriseId)" filterable placeholder="请选择企业名称">
                 <el-option
                   v-for="dict in enterprise"
                   :key="dict.id"
@@ -317,9 +317,6 @@ export default {
     this.getList();
     this.getTreeselect();
     this.getEnterpriseList();
-    this.getPractitioner();
-    this.getSjList();
-    this.getPsyList();
     this.getEquipmentList();
   },
   methods: {
@@ -329,21 +326,18 @@ export default {
         this.enterprise = response.data;
       });
     },
-    //获取管理人员列表
-    getPractitioner() {
-      listPractitioner({"post":"practitioner_gly"}).then(response => {
+    //
+    onSelectChange(id){
+      //获取管理人员列表
+      listPractitioner({"enterpriseId":id}).then(response => {
         this.practitioner = response.data;
       });
-    },
-    //获取司机列表
-    getSjList() {
-      listPersonnel({"post":"personnel_sj"}).then(response => {
+      //获取司机列表
+      listPersonnel({"post":"personnel_sj","enterpriseId":id}).then(response => {
         this.sjList = response.data;
       });
-    },
-    //获取配送员列表
-    getPsyList() {
-      listPersonnel({"post":"personnel_psy"}).then(response => {
+      //获取配送员列表
+      listPersonnel({"post":"personnel_psy","enterpriseId":id}).then(response => {
         this.psyList = response.data;
       });
     },
@@ -381,6 +375,9 @@ export default {
     },
     // 表单重置
     reset() {
+      this.practitioner = []
+      this.sjList = []
+      this.psyList = []
       this.form = {
         id: null,
         createBy: null,

src/main/java/com/sooka/sponest/data/housingconstruction/controller/CenterdataTHousingconstructionPractitionerController.java

@@ -90,14 +90,13 @@ public class CenterdataTHousingconstructionPractitionerController extends BaseCo
     }
 
     /*
-    * 从业人员列表（不分页）
+    * 查询管理人员
     *
     * @author 韩福成
     * @date 2024/7/31 上午9:49
     */
     @GetMapping("/getList")
     public AjaxResult getList(CenterdataTHousingconstructionPractitioner centerdataTHousingconstructionPractitioner) {
-        List<CenterdataTHousingconstructionPractitioner> list = centerdataTHousingconstructionPractitionerService.selectCenterdataTHousingconstructionPractitionerList(centerdataTHousingconstructionPractitioner);
-        return AjaxResult.success(list);
+        return AjaxResult.success(centerdataTHousingconstructionPractitionerService.selectPractitionerByPost(centerdataTHousingconstructionPractitioner));
     }
 }

src/main/java/com/sooka/sponest/data/housingconstruction/mapper/CenterdataTHousingconstructionPractitionerMapper.java

@@ -59,4 +59,12 @@ public interface CenterdataTHousingconstructionPractitionerMapper {
      * @return 结果
      */
     public int deleteCenterdataTHousingconstructionPractitionerByIds(String[] ids);
+
+    /*
+    * 查询管理人员
+    *
+    * @author 韩福成
+    * @date 2024/10/21 下午2:57
+    */
+    public List<CenterdataTHousingconstructionPractitioner> selectPractitionerByPost(CenterdataTHousingconstructionPractitioner centerdataTHousingconstructionPractitioner);
 }

src/main/java/com/sooka/sponest/data/housingconstruction/service/ICenterdataTHousingconstructionPractitionerService.java

@@ -59,4 +59,13 @@ public interface ICenterdataTHousingconstructionPractitionerService {
      * @return 结果
      */
     public int deleteCenterdataTHousingconstructionPractitionerById(String id);
+
+    /*
+    * 查询管理人员
+    *
+    * @author 韩福成
+    * @date 2024/10/21 下午2:56
+    */
+    public List<CenterdataTHousingconstructionPractitioner> selectPractitionerByPost(CenterdataTHousingconstructionPractitioner centerdataTHousingconstructionPractitioner);
+
 }

src/main/java/com/sooka/sponest/data/housingconstruction/service/impl/CenterdataTHousingconstructionPractitionerServiceImpl.java

@@ -138,4 +138,18 @@ public class CenterdataTHousingconstructionPractitionerServiceImpl extends BaseS
     public int deleteCenterdataTHousingconstructionPractitionerById(String id) {
         return centerdataTHousingconstructionPractitionerMapper.deleteCenterdataTHousingconstructionPractitionerById(id);
     }
+
+    /*
+    * 查询管理人员
+    *
+    * @author 韩福成
+    * @date 2024/10/21 下午2:57
+    */
+
+    @DataScopeMutiDept(deptAlias = "d")
+    @Override
+    public List<CenterdataTHousingconstructionPractitioner> selectPractitionerByPost(CenterdataTHousingconstructionPractitioner centerdataTHousingconstructionPractitioner) {
+        setSookaDataBase(centerdataTHousingconstructionPractitioner);
+        return centerdataTHousingconstructionPractitionerMapper.selectPractitionerByPost(centerdataTHousingconstructionPractitioner);
+    }
 }

src/main/resources/mapper/housingconstruction/CenterdataTHousingconstructionPractitionerMapper.xml

@@ -150,4 +150,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectPractitionerByPost" parameterType="CenterdataTHousingconstructionPractitioner" resultMap="CenterdataTHousingconstructionPractitionerResult">
+        <include refid="selectCenterdataTHousingconstructionPractitionerVo"/>
+        left join ${database_system}.sys_dept d on a.dept_id = d.dept_id
+        where (a.post = 'practitioner_gly' or a.post = 'practitioner_aqy')
+        and a.enterprise_id = #{enterpriseId}
+            ${params.dataScope}
+    </select>
 </mapper>