新增工单运维人员查询接口

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/MaintenanceMapper.java

@@ -44,4 +44,10 @@ public interface MaintenanceMapper extends BaseMapper<Maintenance> {
     //验证账号是否签协议
 
     MaintenanceDto getTrainingAgreement( @Param("userId")String userId  );
+
+    List<MaintenanceDto> queryList(
+            @Param("name")String name, //运维人员类型
+            @Param("maintenanceTypeCode")String maintenanceTypeCode, //运维人员类型code
+            @Param("address")String address
+    );
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/MaintenanceMapper.xml

@@ -136,4 +136,46 @@
 
     </select>
 
+
+    <select id="queryList" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto">
+        select
+        ph.*,
+        std_user_biz.real_name name,
+        std_user_biz.emergency_telephone   telephone,
+        std_user_biz.id_type idType,
+        std_user_biz.id_number idCard,
+        std_user_biz.amos_user_name  adminLoginName,
+        std_user_biz.password   adminLoginPwd,
+        std_user_biz.amos_user_id    amosUserId,
+        CASE WHEN std_user_biz.lock_status  = 'UNLOCK' THEN '否'
+        ELSE '是' END AS lockStatus,
+        std_user_biz.id_card_front    idCardFront,
+        std_user_biz.id_card_opposite    idCardOpposite,
+        std_user_biz.amos_org_code   amosDealerCode,
+        std_user_biz.amos_id    amosDealerId
+
+        from  hygf_maintenance ph  LEFT JOIN std_user_biz on ph.foundation_id=std_user_biz.sequence_nbr
+
+        <where>
+            ph.is_delete = 0 and ph.review_status='通过' and  ph.training_status='已培训'  and  ph.is_sign_an_agreement=0
+
+            <if test="name != null and name != ''">
+                AND std_user_biz.real_name LIKE CONCAT('%', #{name}, '%')
+            </if>
+
+            <if test="maintenanceTypeCode != null and maintenanceTypeCode != ''">
+                AND ph.maintenance_type_code = #{maintenanceTypeCode}
+            </if>
+            <if test="address != null and address != ''">
+                and 	(	 ph.maintenance_area like CONCAT('%', #{address}, '%')
+                or   ph.maintenance_area_address like CONCAT('%', #{address}, '%')
+                or   ph.permanent_address_detail like CONCAT('%', #{address}, '%')
+                or   ph.permanent_address_name like CONCAT('%', #{address}, '%'))
+            </if>
+
+        </where>
+    </select>
+
+
+
 </mapper>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/MaintenanceController.java

@@ -149,10 +149,18 @@ public class MaintenanceController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "运维人员列表全部数据查询",   notes = "运维人员列表全部数据查询")
     @GetMapping(value = "/list")
-    public ResponseModel<List<MaintenanceDto>> selectForList() {
-        return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenanceList());
-    }
+    public ResponseModel<List<MaintenanceDto>> selectForList(
+            @RequestParam(required = false) String name, //运维人员类型
+            @RequestParam(required = false)String maintenanceTypeCode, //运维人员类型code
+            @RequestParam(required = false)String address
 
+    ) {
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.queryList(
+                 name, //运维人员类型
+                 maintenanceTypeCode, //运维人员类型code
+                address
+        ));
+    }
 
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MaintenanceServiceImpl.java

@@ -101,8 +101,17 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
     /**
      * 列表查询 示例
      */
-    public List<MaintenanceDto> queryForMaintenanceList()   {
-        return this.queryForList("" , false);
+    public List<MaintenanceDto> queryList(
+            String name, //运维人员类型
+            String maintenanceTypeCode, //运维人员类型code
+            String address
+    ){
+        List<MaintenanceDto> lisda=  maintenanceMapper.queryList(
+                 name, //运维人员类型
+                 maintenanceTypeCode, //运维人员类型code
+                 address
+        );
+     return lisda;
     }
 
 
@@ -282,9 +291,6 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
         Maintenance maintenance = maintenanceMapper.selectById(sequenceNbr);
         MaintenanceDto maintenanceDto = maintenanceMapper.selectOneById(sequenceNbr);
 
-
-
-
         if (maintenanceLog.getOperationResults().equals(MaintenanceUtil.BH)) {
             maintenance.setReviewStatus(MaintenanceUtil.BH);
             maintenanceMapper.updateById(maintenance);