Merge branch 'master' of https://gitee.com/op-souls/ghy-all

ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerTeamController.java

@@ -47,5 +47,20 @@ public class WorkerTeamController extends BaseController {
         return getDataTable(list);
     }
 
+    @PostMapping("/updateTeam")
+    @ResponseBody
+    public AjaxResult updateTeam(@RequestBody WorkerTeam workerTeam){
+        try {
+            int result = workerTeamService.updateWorkerTeam(workerTeam);
+            if(result > 0){
+                return AjaxResult.success("修改成功");
+            }else {
+                return AjaxResult.warn("修改失败");
+            }
+        }catch (Exception e){
+            logger.error(e.getMessage());
+            return AjaxResult.error(ExceptionUtil.getExceptionMessage(e));
+        }
+    }
 }
 

ghy-worker/src/main/java/com/ghy/worker/mapper/WorkerTeamMapper.java

@@ -23,4 +23,10 @@ public interface WorkerTeamMapper {
      * @return 更新成功条数
      */
     int deleteWorkerTeamByIds(Long[] ids);
+
+    /**
+     * @param workerTeam 师傅团队信息
+     * @return 修改成功条数
+     * */
+    int updateWorkerTeam(WorkerTeam workerTeam);
 }

ghy-worker/src/main/java/com/ghy/worker/service/WorkerTeamService.java

@@ -15,4 +15,5 @@ public interface WorkerTeamService {
 
     public int insertWorkerTeam(WorkerTeam workerTeam);
 
+    int updateWorkerTeam(WorkerTeam workerTeam);
 }

ghy-worker/src/main/java/com/ghy/worker/service/impl/WorkerTeamServiceImpl.java

@@ -26,4 +26,9 @@ public class WorkerTeamServiceImpl implements WorkerTeamService {
         return workerTeamMapper.insertWorkerTeam(workerTeam);
     }
 
+    @Override
+    public int updateWorkerTeam(WorkerTeam workerTeam) {
+        return workerTeamMapper.updateWorkerTeam(workerTeam);
+    }
+
 }

ghy-worker/src/main/resources/mapper/worker/WorkerTeamMapper.xml

@@ -37,7 +37,7 @@
     </insert>
 
     <sql id="selectWorkerTeam">
-        SELECT wt.leader_id, wt.worker_name, wt.worker_id, w.phone, w.name, w.worker_logo_url
+        SELECT wt.worker_team_id, wt.leader_id, wt.worker_name, wt.worker_id, w.phone, w.name, w.worker_logo_url
         FROM worker_team wt
         left join worker w on wt.worker_id = w.worker_id
     </sql>
@@ -58,4 +58,11 @@
         </foreach>
     </delete>
 
+    <update id="updateWorkerTeam" parameterType="com.ghy.worker.domain.WorkerTeam">
+        update worker_team
+        <set>
+            <if test="workerName != null and workerName != ''">worker_name = #{workerName}</if>
+        </set>
+        where worker_team_id = #{workerTeamId}
+    </update>
 </mapper>