Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/dto/SuperviseRuleDto.java

@@ -26,7 +26,7 @@ public class SuperviseRuleDto  extends BaseDto {
     private String adminRegion;
 
     @ApiModelProperty(value = "行政区域代码")
-    private String adminRegionCode;
+    private Integer adminRegionCode;
 
     @ApiModelProperty(value = "监察部门id")
     private Long superviseDeptId;

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/entity/SuperviseRule.java

@@ -32,7 +32,7 @@ public class SuperviseRule extends BaseEntity {
      * 行政区域代码
      */
 	@TableField("admin_region_code")
-    private String adminRegionCode;
+    private Integer adminRegionCode;
 
     /**
      * 监察部门id

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/service/IProjectResourceService.java

@@ -9,14 +9,14 @@ import org.aspectj.weaver.ast.Test;
  * 项目资源表（包括焊工、管材、设备）接口类
  *
  * @author system_generator
- * @date 2022-09-22
+ * @date 2022-10-21
  */
 public interface IProjectResourceService {
 
     //焊机设备表
     Page<WelderEquipmentDto> installNoticeMsgList(Page<WelderEquipmentDto> page, String name, String type);
     //焊机设备页面分页查询
-    Page<WelderEquipmentDto> selectByName(Page<WelderEquipmentDto> page, String name ,String unit);
+    WelderEquipmentDto selectByName(Long sequenceNbr);
 
     Page<WelderEquipmentDto> selectByInfo(Page<WelderEquipmentDto> page, Test info , String unit);
     //根据sequenceNbr查询列表数据

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/resources/mapper/ProjectResourceMapper.xml

@@ -3,7 +3,9 @@
 <mapper namespace="com.yeejoin.amos.boot.module.ugp.api.mapper.ProjectResourceMapper">
 
     <select id="WelderEquipment" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto">
-        SELECT tz_ugp_equipment.name,
+        SELECT
+        tz_ugp_project_resource.sequence_nbr,
+        tz_ugp_equipment.name,
         tz_ugp_equipment.code,
         tz_ugp_equipment.type,
         tz_ugp_project.name AS projectName,
@@ -14,89 +16,84 @@
         tz_ugp_equipment.verify_status,
         info,
         tz_ugp_project_resource.sequence_nbr as project_resource_id
-        FROM tz_ugp_project
-        inner join tz_ugp_project_resource on tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
-        and tz_ugp_project_resource.type = 'equipment'
-        inner join tz_ugp_equipment on tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
-        left join tz_ugp_attachment on tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id and
-        tz_ugp_attachment.type = 'enuipment'
-        <where>
+        FROM tz_ugp_project_resource
+        LEFT JOIN tz_ugp_project ON tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
+        LEFT JOIN tz_ugp_equipment ON tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
+        left join tz_ugp_attachment ON tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id
+        WHERE tz_ugp_project_resource.type = 'equipment'
             <if test="name != null and name != ''">
                 and tz_ugp_equipment.name like '%${name}%'
             </if>
             <if test="type != null and type != ''">
                 and tz_ugp_equipment.type like '%${type}%'
             </if>
-        </where>
     </select>
     <select id="selectByName" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto">
         SELECT tz_ugp_equipment.name,
         tz_ugp_equipment.code,
         tz_ugp_equipment.type,
-        tz_ugp_project.name as project_Name,
+        tz_ugp_project.name AS projectName,
+        tz_ugp_project.sequence_nbr AS projectId,
         tz_ugp_equipment.manufacturer,
         tz_ugp_equipment.manufacture_date,
         tz_ugp_equipment.service_life,
         tz_ugp_equipment.verify_status,
-        info
-        FROM tz_ugp_project
-        inner join tz_ugp_project_resource on tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
-        and tz_ugp_project_resource.type = 'equipment'
-        inner join tz_ugp_equipment on tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
-        left join tz_ugp_attachment on tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id and
-        tz_ugp_attachment.type = 'enuipment'
-        <where>
+        info,
+        tz_ugp_project_resource.sequence_nbr as project_resource_id
+        FROM tz_ugp_project_resource
+        LEFT JOIN tz_ugp_project ON tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
+        LEFT JOIN tz_ugp_equipment ON tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
+        left join tz_ugp_attachment ON tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id
+        WHERE tz_ugp_project_resource.type = 'equipment'
             <if test="name != null and name != ''">
                 and tz_ugp_project.name = #{name}
             </if>
             <if test="unit != null and unit != ''">
                 and tz_ugp_project.construction_unit_id = #{unit}
             </if>
-        </where>
     </select>
     <select id="selectByInfo" resultType="com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto">
         SELECT tz_ugp_equipment.name,
         tz_ugp_equipment.code,
         tz_ugp_equipment.type,
-        tz_ugp_project.name AS project_Name,
+        tz_ugp_project.name AS projectName,
+        tz_ugp_project.sequence_nbr AS projectId,
         tz_ugp_equipment.manufacturer,
         tz_ugp_equipment.manufacture_date,
         tz_ugp_equipment.service_life,
         tz_ugp_equipment.verify_status,
-        info
-        FROM tz_ugp_project
-        inner join tz_ugp_project_resource on tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
-        and tz_ugp_project_resource.type = 'equipment'
-        inner join tz_ugp_equipment on tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
-        left join tz_ugp_attachment on tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id and
-        tz_ugp_attachment.type = 'enuipment'
-        <where>
+        info,
+        tz_ugp_project_resource.sequence_nbr as project_resource_id
+        FROM tz_ugp_project_resource
+        LEFT JOIN tz_ugp_project ON tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
+        LEFT JOIN tz_ugp_equipment ON tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
+        left join tz_ugp_attachment ON tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id
+        WHERE tz_ugp_project_resource.type = 'equipment'
             <if test="info != null and info != ''">
                 and tz_ugp_attachment.info = #{info}
             </if>
             <if test="unit != null and unit != ''">
                 and tz_ugp_attachment.company_id = #{unit}
             </if>
-        </where>
     </select>
     <select id="customSelectById"
             resultType="com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto">
         SELECT tz_ugp_equipment.name,
                tz_ugp_equipment.code,
                tz_ugp_equipment.type,
-               tz_ugp_project.name AS project_Name,
+               tz_ugp_project.name AS projectName,
+               tz_ugp_project.sequence_nbr AS projectId,
                tz_ugp_equipment.manufacturer,
                tz_ugp_equipment.manufacture_date,
                tz_ugp_equipment.service_life,
                tz_ugp_equipment.verify_status,
-               info
-        FROM tz_ugp_project
-                 inner join tz_ugp_project_resource on tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
-            and tz_ugp_project_resource.type = 'equipment'
-                 inner join tz_ugp_equipment on tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
-                 left join tz_ugp_attachment on tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id and
-                                                tz_ugp_attachment.type = 'enuipment'
-            where tz_ugp_equipment.sequence_nbr = #{sequenceNbr}
+               info,
+               tz_ugp_project_resource.sequence_nbr as project_resource_id
+        FROM tz_ugp_project_resource
+                 LEFT JOIN tz_ugp_project ON tz_ugp_project.sequence_nbr = tz_ugp_project_resource.project_id
+                 LEFT JOIN tz_ugp_equipment ON tz_ugp_project_resource.resource_id = tz_ugp_equipment.sequence_nbr
+                 left join tz_ugp_attachment ON tz_ugp_equipment.sequence_nbr = tz_ugp_attachment.source_id
+        WHERE tz_ugp_project_resource.type = 'equipment' and  tz_ugp_project_resource.sequence_nbr = #{sequenceNbr}
     </select>
 
 <!--    //管材页面分页,根据名称、编号筛选-->

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

 package com.yeejoin.amos.boot.module.ugp.biz.controller;
 
+import com.netflix.ribbon.proxy.annotation.Http;
 import com.yeejoin.amos.boot.module.ugp.api.dto.MaterialDto;
 import com.yeejoin.amos.boot.module.ugp.api.dto.WelderEquipmentDto;
 import com.alibaba.fastjson.JSONObject;
@@ -92,9 +93,9 @@ public class ProjectResourceController extends BaseController {
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
     @GetMapping(value = "/{sequenceNbr}")
-    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询单个项目资源表（包括焊工、管材、设备）", notes = "根据sequenceNbr查询单个项目资源表（包括焊工、管材、设备）")
-    public ResponseModel<ProjectResourceDto> selectOne(@PathVariable Long sequenceNbr) {
-        return ResponseHelper.buildResponse(projectResourceServiceImpl.queryBySeq(sequenceNbr));
+    @ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询焊机设备）", notes = "根据sequenceNbr查询焊机设备")
+    public ResponseModel<WelderEquipmentDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(projectResourceServiceImpl.customSelectById(sequenceNbr));
     }
 
     /**
@@ -149,6 +150,13 @@ public class ProjectResourceController extends BaseController {
         return ResponseHelper.buildResponse(projectResourceServiceImpl.installNoticeMsgList(page, name, type));
     }
 
+    @TycloudOperation(ApiLevel =  UserType.AGENCY,needAuth = false)
+    @GetMapping(value = "/selectByName")
+    @ApiOperation(httpMethod = "GET", value = "焊机设备分页查询", notes = "焊机设备分页查询")
+    public ResponseModel<WelderEquipmentDto> selectByName(Long sequenceNbr){
+        return ResponseHelper.buildResponse(projectResourceServiceImpl.selectByName(sequenceNbr));
+    }
+
     /**
      * 项目设备新增
      */

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

@@ -64,7 +64,7 @@ public class SuperviseRuleController extends BaseController {
 //		getMap(map,result);
 //		//获取的Map中key是code，value是name
 //		model.setAdminRegion(map.get(model.getAdminRegionCode()));
-    	//外网调不到内网 暂时预留
+//    	//外网调不到内网 暂时预留
 //		OrgUsr orgUsr = orgServiceImpl.getOrgUsr();
 //		model.setSequenceNbr(orgUsr.getSequenceNbr());
 		model = superviseRuleServiceImpl.createWithModel(model);
@@ -139,7 +139,7 @@ public class SuperviseRuleController extends BaseController {
 	public ResponseModel<Page<SuperviseRuleDto>> queryForPage(
 			@RequestParam(value = "current") int current,
 			@RequestParam(value = "size") int size,
-			@RequestParam(value = "adminRegionCode", required = false) String adminRegionCode,
+			@RequestParam(value = "adminRegionCode", required = false) Integer adminRegionCode,
 			@RequestParam(value = "superviseDeptId", required = false) Long superviseDeptId,
 			@RequestParam(value = "inspectionUnitId", required = false) Long inspectionUnitId
 	) {
@@ -147,7 +147,7 @@ public class SuperviseRuleController extends BaseController {
 		Page<SuperviseRuleDto> page = new Page<SuperviseRuleDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(superviseRuleServiceImpl.queryForSuperviseRulePage(page, superviseDeptId, inspectionUnitId));
+	    return ResponseHelper.buildResponse(superviseRuleServiceImpl.queryForSuperviseRulePage(page, superviseDeptId, inspectionUnitId,adminRegionCode));
 	}
 
 	/**

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

@@ -62,8 +62,8 @@ public class ProjectResourceServiceImpl extends BaseService<ProjectResourceDto,P
     }
 
     @Override
-    public Page<WelderEquipmentDto> selectByName(Page<WelderEquipmentDto> page, String name, String unit) {
-        return null;
+    public WelderEquipmentDto selectByName(Long sequenceNbr) {
+        return this.projectResourceMapper.customSelectById(sequenceNbr);
     }
 
     @Override

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

@@ -20,8 +20,11 @@ public class SuperviseRuleServiceImpl extends BaseService<SuperviseRuleDto,Super
     /**
      * 分页查询
      */
-    public Page<SuperviseRuleDto> queryForSuperviseRulePage(Page<SuperviseRuleDto> page, Long superviseDeptId, Long inspectionUnitId)   {
-        return this.queryForPage(page, null, false, superviseDeptId, inspectionUnitId );
+    public Page<SuperviseRuleDto> queryForSuperviseRulePage(Page<SuperviseRuleDto> page, Long superviseDeptId, Long inspectionUnitId,Integer adminRegionCode)   {
+        if(610000 == adminRegionCode){
+            return this.queryForPage(page, null, false, superviseDeptId, inspectionUnitId);
+        }
+        return this.queryForPage(page, null, false, superviseDeptId, inspectionUnitId,adminRegionCode );
     }
 
     /**