班组查询接口

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java

@@ -58,6 +58,7 @@ public class AsBusrepairBillDetailsVo implements Vo {
     private String shotRemarks;
     @ApiModelProperty("备注")
     private String printRemarks;
+    private String remarks; //备注
     @ApiModelProperty("整体优惠金额")
     private String discountAmount;
     @ApiModelProperty("整体优惠券")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java

@@ -62,6 +62,7 @@ public class AsBusrepairBillDto implements Dto {
     private String shotRemarks;
     @ApiModelProperty("备注")
     private String printRemarks;
+    private String remarks; //备注
     @ApiModelProperty("整体优惠金额")
     private String discountAmount;
     @ApiModelProperty("整体优惠券")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java

@@ -58,8 +58,7 @@ public class AsBusrepairBillVo implements Vo {
     private String groupName;
     @ApiModelProperty("主修人（可多选）销售单")
     private String mainRepairers;
-    @ApiModelProperty("快捷备注-销售单")
-    private String shotRemarks;
+    private String remarks; //备注
     @ApiModelProperty("是否需要开发票（是1，否0）")
     private String isInvoicing;
 

yxt-as/src/main/java/com/yxt/anrui/as/api/asservicegroup/AsServiceGroupListVo.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.as.api.asservicegroup;
+
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/4/28 17:04
+ */
+@Data
+public class AsServiceGroupListVo {
+    private String groupSid; //班组sid
+    private String groupName; //班组名称
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml

@@ -51,7 +51,7 @@
         b.waitorName,
         b.groupName,
         b.mainRepairers,
-        b.shotRemarks,
+        b.remarks,
         i.isInvoicing
         FROM
         as_busrepair_bill AS b

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -55,11 +56,13 @@ public interface AsServiceGroupMapper extends BaseMapper<AsServiceGroup> {
 
 	//@Update("update as_service_group set name=#{msg} where id=#{id}")
 	//IPage<AsServiceGroupVo> voPage(IPage<AsServiceGroup> page, @Param(Constants.WRAPPER) QueryWrapper<AsServiceGroup> qw);
-	
+
 	IPage<AsServiceGroupVo> selectPageVo(IPage<AsServiceGroup> page, @Param(Constants.WRAPPER) Wrapper<AsServiceGroup> qw);
-	
+
 	List<AsServiceGroupVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<AsServiceGroup> qw);
-	
+
 	@Select("select * from as_service_group")
 	List<AsServiceGroupVo> selectListVo();
-}
+
+    List<AsServiceGroupListVo> getGroupList(@Param("useOrgSid") String useOrgSid);
+}

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupMapper.xml

@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yxt.anrui.as.biz.asservicegroup.AsServiceGroupMapper">
-<!--    <where> ${ew.sqlSegment} </where>-->
-<!--    ${ew.customSqlSegment} -->
-	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo">
-		SELECT * FROM as_service_group <where> ${ew.sqlSegment} </where>
-	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo">
-		SELECT * FROM as_service_group <where> ${ew.sqlSegment} </where>
-	</select>
-</mapper>
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo">
+        SELECT * FROM as_service_group
+        <where>${ew.sqlSegment}</where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo">
+        SELECT * FROM as_service_group
+        <where>${ew.sqlSegment}</where>
+    </select>
+    <select id="getGroupList" resultType="com.yxt.anrui.as.api.asservicegroup.AsServiceGroupListVo">
+        select sid as groupSid,
+               groupName
+        from as_service_group
+        where createOrgSid = #{useOrgSid}
+    </select>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupRest.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.as.biz.asservicegroup;
 
+import com.yxt.anrui.as.api.asservicegroup.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -33,10 +34,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupQuery;
-import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo;
-import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupDetailsVo;
-import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupDto;
+import java.util.List;
 
 /**
  * Project: yxt-as(售后服务) <br/>
@@ -54,40 +52,48 @@ import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupDto;
 @Api(tags = "班组")
 @RestController
 @RequestMapping("v1/asservicegroup")
-public class AsServiceGroupRest{
+public class AsServiceGroupRest {
 
-	@Autowired
-	private AsServiceGroupService asServiceGroupService;
+    @Autowired
+    private AsServiceGroupService asServiceGroupService;
 
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<AsServiceGroupVo>> listPage(@RequestBody PagerQuery<AsServiceGroupQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<AsServiceGroupVo> pv = asServiceGroupService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<AsServiceGroupVo>> listPage(@RequestBody PagerQuery<AsServiceGroupQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<AsServiceGroupVo> pv = asServiceGroupService.listPageVo(pq);
+        return rb.success().setData(pv);
+    }
 
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody AsServiceGroupDto dto){
-		ResultBean rb = ResultBean.fireFail();
-		asServiceGroupService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
+    @ApiOperation("查询分公司班组信息")
+    @PostMapping("/getGroupList")
+    public ResultBean<List<AsServiceGroupListVo>> getGroupList(@RequestParam("orgPath") String orgPath) {
+        ResultBean rb = ResultBean.fireFail();
+        List<AsServiceGroupListVo> list = asServiceGroupService.getGroupList(orgPath);
+        return rb.success().setData(list);
+    }
 
-	@ApiOperation("根据sid批量删除")
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody AsServiceGroupDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        asServiceGroupService.saveOrUpdateDto(dto);
+        return rb.success();
+    }
+
+    @ApiOperation("根据sid批量删除")
     @DeleteMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		asServiceGroupService.delBySids(sids);
-		return rb.success();
-	}
+    public ResultBean delBySids(@RequestBody String[] sids) {
+        ResultBean rb = ResultBean.fireFail();
+        asServiceGroupService.delBySids(sids);
+        return rb.success();
+    }
 
-	@ApiOperation("根据SID获取一条记录")
+    @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<AsServiceGroupDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		AsServiceGroupDetailsVo vo = asServiceGroupService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
+    public ResultBean<AsServiceGroupDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        AsServiceGroupDetailsVo vo = asServiceGroupService.fetchDetailsVoBySid(sid);
+        return rb.success().setData(vo);
+    }
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicegroup/AsServiceGroupService.java

@@ -28,23 +28,23 @@ package com.yxt.anrui.as.biz.asservicegroup;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.as.api.asservicegroup.*;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign;
+import com.yxt.common.core.result.ResultBean;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.vo.PagerVo;
-import com.yxt.anrui.as.api.asservicegroup.AsServiceGroup;
-import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupQuery;
-import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupVo;
-import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupDetailsVo;
-import com.yxt.anrui.as.api.asservicegroup.AsServiceGroupDto;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Project: yxt-as(售后服务) <br/>
  * File: AsServiceGroupService.java <br/>
@@ -65,7 +65,7 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
 	private SysStaffOrgFeign sysStaffOrgFeign;
 	@Autowired
 	private SysOrganizationFeign sysOrganizationFeign;
-	
+
 	public PagerVo<AsServiceGroupVo> listPageVo(PagerQuery<AsServiceGroupQuery> pq) {
 		AsServiceGroupQuery query = pq.getParams();
 		QueryWrapper<AsServiceGroup> qw = new QueryWrapper<>();
@@ -79,7 +79,7 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
 		PagerVo<AsServiceGroupVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
-	
+
 	public void saveOrUpdateDto(AsServiceGroupDto dto){
         String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
@@ -89,31 +89,41 @@ public class AsServiceGroupService extends MybatisBaseService<AsServiceGroupMapp
 			dto.setCreateOrgSid(createOrgSid);
 			dto.setCreateOrgName(sysOrganizationVo.getName());
             this.insertByDto(dto);
-            return; 
-        } 
+            return;
+        }
 		this.updateByDto(dto);
 	}
-	
+
 	public void insertByDto(AsServiceGroupDto dto){
 		AsServiceGroup entity = new AsServiceGroup();
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.insert(entity);
 	}
-	
+
 	public void updateByDto(AsServiceGroupDto dto){
           String dtoSid = dto.getSid();
         if (StringUtils.isBlank(dtoSid)) {
             return;
-        } 
+        }
 		AsServiceGroup entity = fetchBySid(dtoSid);
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.updateById(entity);
 	}
-	
+
 	public AsServiceGroupDetailsVo fetchDetailsVoBySid(String sid){
 		AsServiceGroup entity = fetchBySid(sid);
 		AsServiceGroupDetailsVo vo = new AsServiceGroupDetailsVo();
 		BeanUtil.copyProperties(entity, vo);
 		return vo;
 	}
-}
+
+	public List<AsServiceGroupListVo> getGroupList(String orgPath) {
+		ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(orgPath);
+		if (orgSidByPath.getSuccess()) {
+			String useOrgSid = orgSidByPath.getData();
+			List<AsServiceGroupListVo> list = baseMapper.getGroupList(useOrgSid);
+			return list;
+		}
+		return new ArrayList<>();
+	}
+}