住建

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

@@ -280,8 +280,8 @@
     </el-dialog>
 
     <!--运营-->
-    <el-dialog :title="title" :visible.sync="open1" width="500px" class="form-style">
-      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+    <el-dialog :title="title" :visible.sync="open1" :width="width" class="form-style">
+      <el-form ref="form" :model="form" :rules="rules" :label-width="labelWidth">
         <template v-if="title == '充装'">
           <el-form-item label="充装介质" prop="fillingMedium">
             <el-input v-model="form.fillingMedium" placeholder="请输入充装介质" maxlength="20"/>
@@ -294,8 +294,8 @@
                             placeholder="选择充装时间">
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="操作员" prop="operatorId">
-            <el-select v-model="form.operatorId" filterable placeholder="请选择操作员">
+          <el-form-item label="充装员" prop="operatorId">
+            <el-select v-model="form.operatorId" filterable placeholder="请选择充装员">
               <el-option
                 v-for="dict in practitioner"
                 :key="dict.id"
@@ -336,24 +336,90 @@
           </el-form-item>
         </template>
         <template v-if="title == '入户'">
-          <el-form-item label="用户" prop="joinHouseId">
-            <el-select v-model="form.joinHouseId" filterable placeholder="请选择用户">
-              <el-option
-                v-for="dict in userList"
-                :key="dict.id"
-                :label="dict.userName"
-                :value="dict.id"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="签收时间" prop="signTime">
-            <el-date-picker clearable
-                            v-model="form.signTime"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            placeholder="选择签收时间">
-            </el-date-picker>
-          </el-form-item>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="用户" prop="joinHouseId">
+                <el-select v-model="form.joinHouseId" filterable placeholder="请选择用户">
+                  <el-option
+                    v-for="dict in userList"
+                    :key="dict.id"
+                    :label="dict.userName"
+                    :value="dict.id"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="签收时间" prop="signTime">
+                <el-date-picker clearable
+                                v-model="form.signTime"
+                                type="date"
+                                value-format="yyyy-MM-dd"
+                                placeholder="选择签收时间">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="1.安检人员" prop="workCard">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.workCard"
+                               @input="getWorkCard"></DataImageUpload>
+            </el-form-item>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="2.是否发现隐患" prop="pitfall">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.pitfall"
+                               @input="getPitfall"></DataImageUpload>
+            </el-form-item>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="3.隐患或环境详情" prop="pitfallDetails">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.pitfallDetails"
+                               @input="getPitfallDetails"></DataImageUpload>
+            </el-form-item>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="4.信息检查" prop="information">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.information"
+                               @input="getInformation"></DataImageUpload>
+            </el-form-item>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="5.钢瓶检查" prop="steelCylinder">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.steelCylinder"
+                               @input="getSteelCylinder"></DataImageUpload>
+            </el-form-item>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="6.连接管检查" prop="tailpiece">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.tailpiece"
+                               @input="getTailpiece"></DataImageUpload>
+            </el-form-item>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="7.器具检查" prop="instrument">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.instrument"
+                               @input="getInstrument"></DataImageUpload>
+            </el-form-item>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="8.阀门检査" prop="valve">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.valve"
+                               @input="getValve"></DataImageUpload>
+            </el-form-item>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="9.可燃气体报警装置检査" prop="warningDevice">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.warningDevice"
+                               @input="getWarningDevice"></DataImageUpload>
+            </el-form-item>
+          </el-row>
+          <el-row :gutter="20">
+            <el-form-item label="10.环境检查" prop="environment">
+              <DataImageUpload ref="ImageUpload" :fileType="['png', 'jpg', 'jpeg']" :value="form.environment"
+                               @input="getEnvironment"></DataImageUpload>
+            </el-form-item>
+          </el-row>
         </template>
         <template v-if="title == '回收'">
           <el-form-item label="入户用户" prop="joinHouseName">
@@ -397,11 +463,12 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import {checkPositiveInteger} from "@/api/rules/rules";
 import {format_date} from "@/views/data/common/dateExport";
 import {listPersonnel, listPractitioner, getCarList} from "@/api/data/housingconstruction/car";
+import DataImageUpload from "@/components/ImageUpload/dataUpload.vue";
 
 
 export default {
   name: "Steelcylinder",
-  components: {Treeselect},
+  components: {DataImageUpload, Treeselect},
   dicts: ['steelcylinder_type', 'steelcylinder_state'],
   data() {
     return {
@@ -421,7 +488,7 @@ export default {
       total: 0,
       // 钢瓶基础数据表格数据
       steelcylinderList: [],
-      //操作员列表
+      //充装员列表
       practitioner: [],
       //企业列表
       enterprise: [],
@@ -433,6 +500,8 @@ export default {
       userList: [],
       // 弹出层标题
       title: "",
+      width: "500px",
+      labelWidth: "110px",
       // 是否显示弹出层
       open: false,
       open1: false,
@@ -500,7 +569,7 @@ export default {
           {required: true, message: "充装时间不能为空", trigger: "blur"},
         ],
         operatorId: [
-          {required: true, message: "操作员不能为空", trigger: "blur"},
+          {required: true, message: "充装员不能为空", trigger: "blur"},
         ],
         carId: [
           {required: true, message: "车辆不能为空", trigger: "blur"},
@@ -520,6 +589,36 @@ export default {
         steelcylinderNumber: [
           {required: true, message: "钢瓶编号不能为空", trigger: "blur"},
         ],
+        workCard: [
+          {required: true, message: "安检人员《送气工工作证》不能为空", trigger: "blur"},
+        ],
+        pitfall: [
+          {required: true, message: "是否发现隐患不能为空", trigger: "blur"},
+        ],
+        pitfallDetails: [
+          {required: true, message: "隐患或环境详情不能为空", trigger: "blur"},
+        ],
+        information: [
+          {required: true, message: "信息检查不能为空", trigger: "blur"},
+        ],
+        steelCylinder: [
+          {required: true, message: "钢瓶检查不能为空", trigger: "blur"},
+        ],
+        tailpiece: [
+          {required: true, message: "连接管检查不能为空", trigger: "blur"},
+        ],
+        instrument: [
+          {required: true, message: "器具检查不能为空", trigger: "blur"},
+        ],
+        valve: [
+          {required: true, message: "阀门检査不能为空", trigger: "blur"},
+        ],
+        warningDevice: [
+          {required: true, message: "可燃气体报警装置检査不能为空", trigger: "blur"},
+        ],
+        environment: [
+          {required: true, message: "环境检查不能为空", trigger: "blur"},
+        ],
       },
     };
   },
@@ -527,33 +626,29 @@ export default {
     this.getList();
     this.getTreeselect();
     this.getEnterpriseList();
-    this.getPractitioner();
-    this.getCarList();
-    this.getPsyList();
-    this.getUserList();
   },
   methods: {
-    //获取操作员员列表
-    getPractitioner() {
-      listPractitioner({"post": "practitioner_czy"}).then(response => {
+    //获取充装员列表
+    getPractitioner(id) {
+      listPractitioner({"post": "practitioner_czy", "enterpriseId": id}).then(response => {
         this.practitioner = response.data;
       });
     },
     //获取配送员列表
-    getPsyList() {
-      listPersonnel({"post": "personnel_psy"}).then(response => {
+    getPsyList(id) {
+      listPersonnel({"post": "personnel_psy", "enterpriseId": id}).then(response => {
         this.psyList = response.data;
       });
     },
     //获取车辆列表
-    getCarList() {
-      getCarList().then(response => {
+    getCarList(id) {
+      getCarList({"enterpriseId": id}).then(response => {
         this.carList = response.data;
       });
     },
     //获取实名用户列表
-    getUserList() {
-      getUserList().then(response => {
+    getUserList(id) {
+      getUserList({"enterpriseId": id}).then(response => {
         this.userList = response.data;
       });
     },
@@ -575,6 +670,36 @@ export default {
       this.form.deptName = node.label
       this.$refs.form.validateField('deptId');
     },
+    getWorkCard(url) {
+      this.form.workCard = url
+    },
+    getPitfall(url) {
+      this.form.pitfall = url
+    },
+    getPitfallDetails(url) {
+      this.form.pitfallDetails = url
+    },
+    getInformation(url) {
+      this.form.information = url
+    },
+    getSteelCylinder(url) {
+      this.form.steelCylinder = url
+    },
+    getTailpiece(url) {
+      this.form.tailpiece = url
+    },
+    getInstrument(url) {
+      this.form.instrument = url
+    },
+    getValve(url) {
+      this.form.valve = url
+    },
+    getWarningDevice(url) {
+      this.form.warningDevice = url
+    },
+    getEnvironment(url) {
+      this.form.environment = url
+    },
     /** 查询钢瓶基础数据列表 */
     getList() {
       this.loading = true;
@@ -596,6 +721,8 @@ export default {
     },
     // 表单重置
     reset() {
+      this.width = "500px"
+      this.labelWidth = "110px"
       this.form = {
         id: null,
         createBy: null,
@@ -721,14 +848,20 @@ export default {
       if (row.state == "state_1" || row.state == "state_5") {
         this.title = "充装";
         this.form.state = "state_2";
+        this.getPractitioner(row.enterpriseId);
       }
       if (row.state == "state_2") {
         this.title = "运输";
         this.form.state = "state_3";
+        this.getPsyList(row.enterpriseId);
+        this.getCarList(row.enterpriseId);
       }
       if (row.state == "state_3") {
         this.title = "入户";
+        this.width = "1000px"
+        this.labelWidth = "175px"
         this.form.state = "state_4";
+        this.getUserList(row.enterpriseId);
       }
       if (row.state == "state_4") {
         this.title = "回收";

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

@@ -1,5 +1,6 @@
 package com.sooka.sponest.data.housingconstruction.controller;
 
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
@@ -8,6 +9,7 @@ import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionSteelcylinder;
 import com.sooka.sponest.data.housingconstruction.domain.CenterdataTHousingconstructionSteelcylinderLog;
+import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionAttachService;
 import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionSteelcylinderLogService;
 import com.sooka.sponest.data.housingconstruction.service.ICenterdataTHousingconstructionSteelcylinderService;
 import com.sooka.sponest.data.utils.ExcelUtil;
@@ -15,7 +17,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 钢瓶日志Controller
@@ -32,6 +37,8 @@ public class CenterdataTHousingconstructionSteelcylinderLogController extends Ba
     @Autowired
     private ICenterdataTHousingconstructionSteelcylinderService centerdataTHousingconstructionSteelcylinderService;
 
+    @Autowired
+    private ICenterdataTHousingconstructionAttachService attachService;
     /**
      * 查询钢瓶日志列表
      */
@@ -82,24 +89,96 @@ public class CenterdataTHousingconstructionSteelcylinderLogController extends Ba
     * @date 2024/7/31 下午5:21
     */
     @PostMapping(value = "/addLog")
-    public AjaxResult addLog(@RequestBody CenterdataTHousingconstructionSteelcylinderLog centerdataTHousingconstructionSteelcylinderLog) {
-        CenterdataTHousingconstructionSteelcylinder steelcylinder = centerdataTHousingconstructionSteelcylinderService.selectCenterdataTHousingconstructionSteelcylinderById(centerdataTHousingconstructionSteelcylinderLog.getSteelcylinderId());
+    public AjaxResult addLog(@RequestBody CenterdataTHousingconstructionSteelcylinderLog steelcylinderLog) {
+        CenterdataTHousingconstructionSteelcylinder steelcylinder = centerdataTHousingconstructionSteelcylinderService.selectCenterdataTHousingconstructionSteelcylinderById(steelcylinderLog.getSteelcylinderId());
         //修改钢瓶状态
         CenterdataTHousingconstructionSteelcylinder centerdataTHousingconstructionSteelcylinder = new CenterdataTHousingconstructionSteelcylinder();
-        centerdataTHousingconstructionSteelcylinder.setId(centerdataTHousingconstructionSteelcylinderLog.getSteelcylinderId());
-        centerdataTHousingconstructionSteelcylinder.setState(centerdataTHousingconstructionSteelcylinderLog.getState());
+        centerdataTHousingconstructionSteelcylinder.setId(steelcylinderLog.getSteelcylinderId());
+        centerdataTHousingconstructionSteelcylinder.setState(steelcylinderLog.getState());
         centerdataTHousingconstructionSteelcylinderService.updateCenterdataTHousingconstructionSteelcylinder(centerdataTHousingconstructionSteelcylinder);
         //按钢瓶id查询最新日志
-        CenterdataTHousingconstructionSteelcylinderLog log = centerdataTHousingconstructionSteelcylinderLogService.selectBySteelcylinderId(centerdataTHousingconstructionSteelcylinderLog.getSteelcylinderId());
+        CenterdataTHousingconstructionSteelcylinderLog log = centerdataTHousingconstructionSteelcylinderLogService.selectBySteelcylinderId(steelcylinderLog.getSteelcylinderId());
+        //当流转状态为入户时新增附件
+        extracted(steelcylinderLog, log);
         if (log ==null){
-            return toAjax(centerdataTHousingconstructionSteelcylinderLogService.insertCenterdataTHousingconstructionSteelcylinderLog(centerdataTHousingconstructionSteelcylinderLog));
+            return toAjax(centerdataTHousingconstructionSteelcylinderLogService.insertCenterdataTHousingconstructionSteelcylinderLog(steelcylinderLog));
         }else {
-            if (steelcylinder.getState().equals("state_5")&&centerdataTHousingconstructionSteelcylinderLog.getState().equals("state_2")){
-                centerdataTHousingconstructionSteelcylinderLog.setJoinWarehouseTime(log.getJoinWarehouseTime());
-                return toAjax(centerdataTHousingconstructionSteelcylinderLogService.insertCenterdataTHousingconstructionSteelcylinderLog(centerdataTHousingconstructionSteelcylinderLog));
+            //当钢瓶状态为回收或流转状态为充装时新增一条日志
+            if (steelcylinder.getState().equals("state_5")&&steelcylinderLog.getState().equals("state_2")){
+                steelcylinderLog.setJoinWarehouseTime(log.getJoinWarehouseTime());
+                return toAjax(centerdataTHousingconstructionSteelcylinderLogService.insertCenterdataTHousingconstructionSteelcylinderLog(steelcylinderLog));
             }else {
-                centerdataTHousingconstructionSteelcylinderLog.setId(log.getId());
-                return toAjax(centerdataTHousingconstructionSteelcylinderLogService.updateCenterdataTHousingconstructionSteelcylinderLog(centerdataTHousingconstructionSteelcylinderLog));
+                steelcylinderLog.setId(log.getId());
+                return toAjax(centerdataTHousingconstructionSteelcylinderLogService.updateCenterdataTHousingconstructionSteelcylinderLog(steelcylinderLog));
+            }
+        }
+    }
+
+    private void extracted(CenterdataTHousingconstructionSteelcylinderLog steelcylinderLog, CenterdataTHousingconstructionSteelcylinderLog log) {
+        if (steelcylinderLog.getState().equals("state_4")){
+            List<Map<String,Object>> list = new ArrayList<>();
+            if (StringUtils.isNotEmpty(steelcylinderLog.getWorkCard())) {
+                Map<String,Object> photo = new HashMap<>();
+                photo.put("key","workCard");
+                photo.put("value", steelcylinderLog.getWorkCard());
+                list.add(photo);
+            }
+            if (StringUtils.isNotEmpty(steelcylinderLog.getPitfall())) {
+                Map<String,Object> photo = new HashMap<>();
+                photo.put("key","pitfall");
+                photo.put("value", steelcylinderLog.getPitfall());
+                list.add(photo);
+            }
+            if (StringUtils.isNotEmpty(steelcylinderLog.getPitfallDetails())) {
+                Map<String,Object> photo = new HashMap<>();
+                photo.put("key","pitfallDetails");
+                photo.put("value", steelcylinderLog.getPitfallDetails());
+                list.add(photo);
+            }
+            if (StringUtils.isNotEmpty(steelcylinderLog.getInformation())) {
+                Map<String,Object> photo = new HashMap<>();
+                photo.put("key","information");
+                photo.put("value", steelcylinderLog.getInformation());
+                list.add(photo);
+            }
+            if (StringUtils.isNotEmpty(steelcylinderLog.getSteelCylinder())) {
+                Map<String,Object> photo = new HashMap<>();
+                photo.put("key","steelCylinder");
+                photo.put("value", steelcylinderLog.getSteelCylinder());
+                list.add(photo);
+            }
+            if (StringUtils.isNotEmpty(steelcylinderLog.getTailpiece())) {
+                Map<String,Object> photo = new HashMap<>();
+                photo.put("key","tailpiece");
+                photo.put("value", steelcylinderLog.getTailpiece());
+                list.add(photo);
+            }
+            if (StringUtils.isNotEmpty(steelcylinderLog.getInstrument())) {
+                Map<String,Object> photo = new HashMap<>();
+                photo.put("key","instrument");
+                photo.put("value", steelcylinderLog.getInstrument());
+                list.add(photo);
+            }
+            if (StringUtils.isNotEmpty(steelcylinderLog.getValve())) {
+                Map<String,Object> photo = new HashMap<>();
+                photo.put("key","valve");
+                photo.put("value", steelcylinderLog.getValve());
+                list.add(photo);
+            }
+            if (StringUtils.isNotEmpty(steelcylinderLog.getWarningDevice())) {
+                Map<String,Object> photo = new HashMap<>();
+                photo.put("key","warningDevice");
+                photo.put("value", steelcylinderLog.getWarningDevice());
+                list.add(photo);
+            }
+            if (StringUtils.isNotEmpty(steelcylinderLog.getEnvironment())) {
+                Map<String,Object> photo = new HashMap<>();
+                photo.put("key","environment");
+                photo.put("value", steelcylinderLog.getEnvironment());
+                list.add(photo);
+            }
+            if (StringUtils.isNotEmpty(list)) {
+                attachService.addAttach(list, log.getId());
             }
         }
     }

src/main/java/com/sooka/sponest/data/housingconstruction/domain/CenterdataTHousingconstructionSteelcylinderLog.java

@@ -3,6 +3,7 @@ package com.sooka.sponest.data.housingconstruction.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.sooka.sponest.data.base.domain.BaseBusinessEntity;
+import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -14,6 +15,7 @@ import java.util.Date;
  * @author ruoyi
  * @date 2024-07-30
  */
+@Data
 public class CenterdataTHousingconstructionSteelcylinderLog extends BaseBusinessEntity {
     private static final long serialVersionUID = 1L;
 
@@ -129,165 +131,25 @@ public class CenterdataTHousingconstructionSteelcylinderLog extends BaseBusiness
 
     private String state;
 
-    public String getEnterpriseName() {
-        return enterpriseName;
-    }
-
-    public void setEnterpriseName(String enterpriseName) {
-        this.enterpriseName = enterpriseName;
-    }
-
-    public String getState() {
-        return state;
-    }
-
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setSteelcylinderId(String steelcylinderId) {
-        this.steelcylinderId = steelcylinderId;
-    }
-
-    public String getSteelcylinderId() {
-        return steelcylinderId;
-    }
-
-    public void setSteelcylinderName(String steelcylinderName) {
-        this.steelcylinderName = steelcylinderName;
-    }
-
-    public String getSteelcylinderName() {
-        return steelcylinderName;
-    }
-
-    public void setJoinWarehouseTime(Date joinWarehouseTime) {
-        this.joinWarehouseTime = joinWarehouseTime;
-    }
-
-    public Date getJoinWarehouseTime() {
-        return joinWarehouseTime;
-    }
-
-    public void setFillingMedium(String fillingMedium) {
-        this.fillingMedium = fillingMedium;
-    }
-
-    public String getFillingMedium() {
-        return fillingMedium;
-    }
-
-    public void setFillingTime(Date fillingTime) {
-        this.fillingTime = fillingTime;
-    }
-
-    public Date getFillingTime() {
-        return fillingTime;
-    }
-
-    public void setOperatorId(String operatorId) {
-        this.operatorId = operatorId;
-    }
-
-    public String getOperatorId() {
-        return operatorId;
-    }
+    private String workCard;
 
-    public void setOperatorName(String operatorName) {
-        this.operatorName = operatorName;
-    }
-
-    public String getOperatorName() {
-        return operatorName;
-    }
-
-    public void setCarId(String carId) {
-        this.carId = carId;
-    }
-
-    public String getCarId() {
-        return carId;
-    }
-
-    public void setCarNumber(String carNumber) {
-        this.carNumber = carNumber;
-    }
+    private String pitfall;
 
-    public String getCarNumber() {
-        return carNumber;
-    }
+    private String pitfallDetails;
 
-    public void setDeliveryTime(Date deliveryTime) {
-        this.deliveryTime = deliveryTime;
-    }
+    private String information;
 
-    public Date getDeliveryTime() {
-        return deliveryTime;
-    }
+    private String steelCylinder;
 
-    public void setDeliveryId(String deliveryId) {
-        this.deliveryId = deliveryId;
-    }
+    private String tailpiece;
 
-    public String getDeliveryId() {
-        return deliveryId;
-    }
+    private String instrument;
 
-    public void setDeliveryName(String deliveryName) {
-        this.deliveryName = deliveryName;
-    }
-
-    public String getDeliveryName() {
-        return deliveryName;
-    }
+    private String valve;
 
-    public void setSignTime(Date signTime) {
-        this.signTime = signTime;
-    }
+    private String warningDevice;
 
-    public Date getSignTime() {
-        return signTime;
-    }
-
-    public void setJoinHouseId(String joinHouseId) {
-        this.joinHouseId = joinHouseId;
-    }
-
-    public String getJoinHouseId() {
-        return joinHouseId;
-    }
-
-    public void setJoinHouseName(String joinHouseName) {
-        this.joinHouseName = joinHouseName;
-    }
-
-    public String getJoinHouseName() {
-        return joinHouseName;
-    }
-
-    public void setRecyclingName(String recyclingName) {
-        this.recyclingName = recyclingName;
-    }
-
-    public String getRecyclingName() {
-        return recyclingName;
-    }
-
-    public void setRecyclingTime(Date recyclingTime) {
-        this.recyclingTime = recyclingTime;
-    }
-
-    public Date getRecyclingTime() {
-        return recyclingTime;
-    }
+    private String environment;
 
     @Override
     public String toString() {

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

@@ -154,8 +154,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <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}
+        where a.enterprise_id = #{enterpriseId}
+        <choose>
+            <when test="post != null">
+                and a.post = #{post}
+            </when>
+            <otherwise>and  (a.post = 'practitioner_gly' or a.post = 'practitioner_aqy')</otherwise>
+        </choose>
             ${params.dataScope}
     </select>
 </mapper>