Browse Source

食堂负责人修改

elis 2 years ago
parent
commit
2f36e83569

+ 14 - 3
naqwzsjtj/naqwzsjtj/src/views/canteen/CanteenManage.vue

@@ -82,7 +82,7 @@
           </el-row>
           <el-row>
             <el-col :span="22">
-              <el-form-item class="input-star" label="负责人" prop="principal">
+              <el-form-item class="input-star" label="负责人" prop="state">
 <!--                <el-input v-model="postManagement.principal" @click="selectUser" maxlength="32" placeholder="请输入食堂负责人">-->
 <!--                </el-input>-->
 
@@ -91,6 +91,7 @@
                   :fetch-suggestions="querySearchAsync"
                   placeholder="请输入食堂负责人"
                   @select="handleSelect"
+                  @blur = "handelBlur"
                 ></el-autocomplete>
               </el-form-item>
             </el-col>
@@ -264,10 +265,18 @@
       },
 
       handleSelect(item) {
+        console.log(item.phone);
+        console.log(item.id);
+        console.log(item.value);
         this.postManagement.complaintPhone = item.phone
         this.postManagement.workerId = item.id
-        this.postManagement.principal = item.username
-        // console.log(item);
+        this.postManagement.principal = item.value
+        console.log(item);
+      },
+      handelBlur(){
+        if (this.state!=this.postManagement.principal){
+          this.state="";
+        }
       },
       // 删除文件
       picRemove(file, fileList) {
@@ -527,6 +536,8 @@
       },
       // 保存
       saveWork() {
+        this.postManagement.principal = this.state
+        console.log(this.postManagement);
         if (
           !this.postManagement.canteenName ||
           this.postManagement.canteenName.length < 1

+ 1 - 0
nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/CanteenServiceImpl.java

@@ -216,6 +216,7 @@ public class CanteenServiceImpl implements CanteenService {
         old.setPrincipal(canteenDO.getPrincipal());
         old.setComplaintPhone(canteenDO.getComplaintPhone());
         old.setTakeoutPhone(canteenDO.getTakeoutPhone());
+        old.setWorkerId(canteenDO.getWorkerId());
         old.setUpdateTime(new Date());
         if (canteenDao.updateSCanteen(old) <= 0) {
             return SendUtil.send(false, ConstStr.RESULT_FAILED);

+ 16 - 15
nngkxxdp/src/main/resources/mapper/CanteenDao.xml

@@ -26,7 +26,7 @@
                principal,
                complaint_phone,
                takeout_phone,
-               workerId,
+               worker_id,
                create_time,
                update_time,
                isdel
@@ -50,7 +50,7 @@
     <select id="pageList" resultType="java.util.Map">
         SELECT
         s_canteen.id, canteen_name, canteen_photo_path, supply_time_id, u.user_name founder, s_canteen.principal,
-        complaint_phone complaintPhone, takeout_phone takeoutPhone, s_canteen.create_time, s_canteen.update_time,workerId,
+        complaint_phone complaintPhone, takeout_phone takeoutPhone, s_canteen.create_time, s_canteen.update_time,worker_id,
         s_canteen.isdel
         FROM s_canteen
         LEFT JOIN p_user u
@@ -77,7 +77,7 @@
     <!--新增所有列-->
     <insert id="addSCanteen">
         INSERT INTO s_canteen(id, canteen_name, canteen_photo_path, supply_time_id, founder, principal,
-                              complaint_phone, takeout_phone, create_time, update_time, isdel,workerId)
+                              complaint_phone, takeout_phone, create_time, update_time, isdel,worker_id)
         VALUES (#{id}, #{canteenName}, #{canteenPhotoPath}, #{supplyTimeId}, #{founder}, #{principal},
                 #{complaintPhone}, #{takeoutPhone}, #{createTime}, #{updateTime}, #{isdel},#{workerId})
     </insert>
@@ -108,7 +108,7 @@
                 update_time = #{updateTime},
             </if>
             <if test="workerId !=null and workerId !=''">
-                workerId = #{workerId}
+                worker_id = #{workerId},
             </if>
             <if test="isdel != null">
                 isdel = #{isdel},
@@ -146,18 +146,19 @@
 
     <select id="getAllCanteen" resultType="com.example.nngkxxdp.entity.CanteenNeDO">
         SELECT canteen_name,
-               id,
-               supply_time_id,
-               founder,
-               principal,
-               complaint_phone,
-               takeout_phone,
-               canteen_photo_path,
-               workerId
-        FROM s_canteen
-        WHERE isdel = 0
+        sc.id,
+        sc.supply_time_id,
+        sc.founder,
+        sc.principal,
+        sc.complaint_phone,
+        sc.takeout_phone,
+        sc.canteen_photo_path,
+        sc.worker_id
+        FROM s_canteen sc
+        left join s_worker sw on sc.worker_id = sw.id
+        WHERE sc.isdel = 0
         <if test="userId != null and userId != ''">
-            AND principal = #{userId}
+            AND sw.wx_user_id = #{userId}
         </if>
     </select>
     <select id="getAllDeliciousByDishesId" resultType="java.util.Map">

+ 1 - 1
nngkxxdp/src/main/resources/mapper/SWorkerDao.xml

@@ -131,7 +131,7 @@
     </select>
 
     <select id="queryList" resultType="map">
-        select name as userName,phone_num as phone,id from s_worker where is_del = 0
+        select name as userName,phone_num as phone,id from s_worker where is_del = 0 and role = 1
     </select>
 
 </mapper>