更新

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -123,5 +123,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List<OrgUsr> selectPersonListByCompanyIdList(@Param("companyIdList") List<String> companyIdList);
 
-    List<OrgUsr> getWelderByProjectId(@Param("projectId") String projectId, @Param("companyId") Long companyId);
+    List<OrgUsr> getWelderByProjectId(@Param("projectId") String projectId, @Param("companyId") Long companyId, @Param("name") String name);
+
+    List<OrgUsr> getAllListByProjectId(@Param("projectId") String projectId, @Param("companyId") Long companyId, @Param("name") String name);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -883,19 +883,32 @@ LEFT JOIN (
     </select>
     <select id="getWelderByProjectId" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
         SELECT
-            cou.*
+        cou.*
         FROM
-            cb_org_usr cou
-                LEFT JOIN tz_ugp_project_resource upr ON cou.sequence_nbr = upr.resource_id
+        cb_org_usr cou
+        LEFT JOIN tz_ugp_project_resource upr ON cou.sequence_nbr = upr.resource_id
         <where>
-
-            <if test="projectId != null and projectId != ''">
-                upr.type = 'welder'  AND upr.project_id = #{projectId}
-            </if>
-            <if test="projectId == null or projectId == ''">
-                AND  upr.resource_id is null
+            upr.type = 'welder' AND upr.project_id = #{projectId}
+            AND cou.parent_id = #{companyId}
+            <if test="name != null and name != ''">
+                and   cou.biz_org_name like concat('%', #{name}, '%')
             </if>
+        </where>
+
+    </select>
+
+    <select id="getAllListByProjectId" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT
+        cou.*
+        FROM
+        cb_org_usr cou
+        LEFT JOIN tz_ugp_project_resource upr ON cou.sequence_nbr = upr.resource_id
+        <where>
+            ( (upr.project_id = #{projectId} and upr.type = 'welder' ) or upr.resource_id is null)
             AND cou.parent_id = #{companyId}
+            <if test="name != null and name != ''">
+              and  cou.biz_org_name like concat('%', #{name}, '%')
+            </if>
         </where>
 
     </select>

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -2478,9 +2478,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return this.baseMapper.selectList(wrapper).stream().collect(Collectors.toList());
 	}
 
-	public List<OrgUsr>	getWelderByProjectId(String projectId, Long companyId) {
-		return this.baseMapper.getWelderByProjectId(projectId, companyId);
+	public List<OrgUsr>	getWelderByProjectId(String projectId, Long companyId, String name) {
+		return this.baseMapper.getWelderByProjectId(projectId, companyId, name);
 	}
 
+	public List<OrgUsr>	getAllListByProjectId(String projectId, Long companyId, String name) {
+		return this.baseMapper.getAllListByProjectId(projectId, companyId, name);
+	}
 
 }
\ No newline at end of file

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/WelderController.java

@@ -280,14 +280,31 @@ public class WelderController extends BaseController {
 
     /**
      * 项目绑定焊工人员信息
+     *
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "查询项目已绑定焊工信息", notes = "查询项目已绑定焊工信息")
     @GetMapping(value = "/getWelderByProjectId")
-    public ResponseModel<Object> getWelderByProjectId(@RequestParam(value = "projectId", required = false)String projectId,
-                                                      @RequestParam(value = "current")int current,
-                                                      @RequestParam(value = "size")int size) {
-        return ResponseHelper.buildResponse(welderServiceImpl.getWelderByProjectId(projectId, current, size));
+    public ResponseModel<Object> getWelderByProjectId(@RequestParam(value = "projectId") String projectId,
+                                                      @RequestParam(value = "current") int current,
+                                                      @RequestParam(value = "size") int size,
+                                                      @RequestParam(value = "name", required = false) String name) {
+        return ResponseHelper.buildResponse(welderServiceImpl.getWelderByProjectId(projectId, current, size, name, null));
+    }
+
+    /**
+     * 项目绑定焊工人员信息、以及空闲人员
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "项目绑定焊工人员信息、以及空闲人员", notes = "项目绑定焊工人员信息、以及空闲人员")
+    @GetMapping(value = "/getAllListByProjectId")
+    public ResponseModel<Object> getAllListByProjectId(@RequestParam(value = "projectId") String projectId,
+                                                       @RequestParam(value = "current") int current,
+                                                       @RequestParam(value = "size") int size,
+                                                       @RequestParam(value = "name", required = false) String name) {
+        return ResponseHelper.buildResponse(welderServiceImpl.getWelderByProjectId(projectId, current, size, name, "all"));
     }
 }

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WelderServiceImpl.java

@@ -27,6 +27,7 @@ import com.yeejoin.amos.feign.privilege.util.DesUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
@@ -218,12 +219,17 @@ public class WelderServiceImpl {
 
 
     @BusinessIdentify
-    public Page<Map<String, Object>> getWelderByProjectId(String projectId, int current, int size) {
+    public Page<Map<String, Object>> getWelderByProjectId(String projectId, int current, int size, String name, String type) {
         Page<Map<String, Object>> mapPage = new Page<>();
         ArrayList<Map<String, Object>> maps = new ArrayList<>();
         ReginParams reginParams = orgService.getReginParams();
         Long companySequenceNbr = reginParams.getBusinessInfo().getCompanySequenceNbr();
-        List<OrgUsr> usrList = orgUsrService.getWelderByProjectId(projectId, companySequenceNbr);
+        List<OrgUsr> usrList;
+        if (!ObjectUtils.isEmpty(type) && "all".equals(type)) {
+            usrList = orgUsrService.getAllListByProjectId(projectId, companySequenceNbr, name);
+        } else {
+            usrList = orgUsrService.getWelderByProjectId(projectId, companySequenceNbr, name);
+        }
         mapPage.setTotal(usrList.size());
         List<OrgUsr> collect = usrList.stream()
                 .skip((long) (current - 1) * size)