Merge branch 'dev0124' of http://36.40.66.175:5000/moa/amos-boot-biz into dev0124

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MaintenanceDto.java

 package com.yeejoin.amos.boot.module.hygf.api.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceFile;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 运维人员
@@ -126,8 +129,21 @@ public class MaintenanceDto  extends BaseDto {
     @ApiModelProperty(value = "常住地址")
     private String permanentAddressName;
 
+    /**
+     *
+     * 基础人员表
+     * */
+    private Long foundationId;
 
 
+    //证书
+    List<MaintenanceFile> maintenanceFiles;
 
 
+    @ApiModelProperty(value = "身份证正面")
+    private  List<Object> idCardFrontList;
+
+    @ApiModelProperty(value = "身份证反面")
+    private  List<Object> idCardOppositeList;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/Maintenance.java

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 运维人员
@@ -25,211 +27,223 @@ public class Maintenance extends BaseEntity {
     /**
      * 运维人员类型名称
      */
-	@TableField("maintenance_type")
+    @TableField("maintenance_type")
     private String maintenanceType;
 
     /**
      * 运维人员类型code
      */
-	@TableField("maintenance_type_code")
+    @TableField("maintenance_type_code")
     private String maintenanceTypeCode;
 
     /**
      * 运维区域名称
      */
-	@TableField("maintenance_area")
+    @TableField("maintenance_area")
     private String maintenanceArea;
 
     /**
      * 运维区域code
      */
-	@TableField("maintenance_area_code")
-    private String maintenanceAreaCode;
+    @TableField(value = "maintenance_area_code",typeHandler = FastjsonTypeHandler.class)
+    private List<Integer> maintenanceAreaCode;
 
     /**
      * 运维工种名称
      */
-	@TableField("maintenance_workers")
+    @TableField("maintenance_workers")
     private String maintenanceWorkers;
 
     /**
      * 运维工种code
      */
-	@TableField("maintenance_workers_code")
+    @TableField("maintenance_workers_code")
     private String maintenanceWorkersCode;
 
     /**
      * 所属区域公司id
      */
-	@TableField("regional_companies_seq")
+    @TableField("regional_companies_seq")
     private Long regionalCompaniesSeq;
 
     /**
      * 所属区域公司名称
      */
-	@TableField("regional_companies_name")
+    @TableField("regional_companies_name")
     private String regionalCompaniesName;
 
     /**
      * 所属区域公司code
      */
-	@TableField("regional_companies_code")
+    @TableField("regional_companies_code")
     private String regionalCompaniesCode;
 
     /**
      * 业务经销商name
      */
-	@TableField("dealer_name")
+    @TableField("dealer_name")
     private String dealerName;
 
     /**
      * 业务经销商id
      */
-	@TableField("dealer_id")
+    @TableField("dealer_id")
     private Long dealerId;
 
     /**
      * 平台经销商单位id
      */
-	@TableField("amos_dealer_id")
+    @TableField(exist = false)
     private Long amosDealerId;
+   /**
+    *
+    * 基础人员表
+    * */
+    @TableField("foundation_id")
+    private Long foundationId;
+
 
     /**
      * 平台经销商code
      */
-	@TableField("amos_dealer_code")
+    @TableField(exist = false)
     private String amosDealerCode;
 
     /**
      * 证件号码
      */
-	@TableField("id_card")
-    private String idCard;
+    @TableField(exist = false)
+   private String idCard;
 
     /**
      * 身份证正面
      */
-	@TableField("id_card_front")
-    private String idCardFront;
 
+    @TableField(exist = false, typeHandler = FastjsonTypeHandler.class)
+    private List<Object> idCardFront;
     /**
      * 身份证反面
      */
-	@TableField("id_card_opposite")
-    private String idCardOpposite;
-
+    @TableField(exist = false, typeHandler = FastjsonTypeHandler.class)
+    private List<Object> idCardOpposite;
     /**
      * 业主姓名
      */
-	@TableField("name")
+    @TableField(exist = false)
     private String name;
 
     /**
      * 联系电话
      */
-	@TableField("telephone")
+    @TableField(exist = false)
     private String telephone;
 
     /**
      * 证件类型
      */
-	@TableField("id_type")
+    @TableField(exist = false)
     private String idType;
 
+
+
     /**
      * 管理员账户名
      */
-	@TableField("admin_login_name")
+    @TableField(exist = false)
     private String adminLoginName;
 
     /**
      * 管理员密码
      */
-	@TableField("admin_login_pwd")
+    @TableField(exist = false)
     private String adminLoginPwd;
-
+    /**
+     * 平台userId
+     */
+    @TableField(exist = false)
+    private String amosUserId;
+    /**
+     * 是否锁定
+     */
+    @TableField(exist = false)
+    private String lockStatus;
     /**
      * 低压电工证
      */
-	@TableField("electrician_certificate")
-    private String electricianCertificate;
+    @TableField(exist = false, typeHandler = FastjsonTypeHandler.class)
+    private  List<Object> electricianCertificate;
 
     /**
      * 登高证
      */
-	@TableField("climbing_certificate")
-    private String climbingCertificate;
+    @TableField(exist = false, typeHandler = FastjsonTypeHandler.class)
+    private  List<Object> climbingCertificate;
 
     /**
      * 低压电工证有效期开始
      */
-	@TableField("electrician_certificate_start")
+    @TableField(exist = false)
     private Date electricianCertificateStart;
 
     /**
      * 低压电工证有效期结束
      */
-	@TableField("electrician_certificate_end")
+    @TableField(exist = false)
     private Date electricianCertificateEnd;
 
     /**
      * 登高证有效期开始
      */
-	@TableField("climbing_certificate_start")
+    @TableField(exist = false)
     private Date climbingCertificateStart;
 
     /**
      * 登高证有效期结束
      */
-	@TableField("climbing_certificate_end")
+    @TableField(exist = false)
     private Date climbingCertificateEnd;
 
     /**
      * 培训状态
      */
-	@TableField("training_status")
+    @TableField("training_status")
     private String trainingStatus;
 
     /**
      * 审核状态
      */
-	@TableField("review_status")
+    @TableField("review_status")
     private String reviewStatus;
 
-    /**
-     * 平台userId
-     */
-	@TableField("amos_user_id")
-    private String amosUserId;
 
-    /**
-     * 是否锁定
-     */
-	@TableField("lock_status")
-    private String lockStatus;
+
+
 
     /**
      * 运维区域详细地址
      */
-	@TableField("maintenance_area_address")
+    @TableField("maintenance_area_address")
     private String maintenanceAreaAddress;
 
     /**
      * 常住地址code
      */
-	@TableField("permanent_address_code")
-    private String permanentAddressCode;
+    @TableField(value ="permanent_address_code",typeHandler = FastjsonTypeHandler.class)
+    private List<Integer>  permanentAddressCode;
 
     /**
      * 常住详细地址
      */
-	@TableField("permanent_address_detail")
+    @TableField("permanent_address_detail")
     private String permanentAddressDetail;
 
     /**
      * 常住地址
      */
-	@TableField("permanent_address_name")
+    @TableField("permanent_address_name")
     private String permanentAddressName;
 
+    //证书
+    @TableField(exist = false)
+    List<MaintenanceFile> maintenanceFiles;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/MaintenanceFile.java

@@ -2,11 +2,13 @@ package com.yeejoin.amos.boot.module.hygf.api.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 运维人员文件
@@ -25,37 +27,37 @@ public class MaintenanceFile extends BaseEntity {
     /**
      * 运维人员id
      */
-	@TableField("maintenance_id")
+    @TableField("maintenance_id")
     private Long maintenanceId;
 
     /**
      * 文件标识
      */
-	@TableField("file_key")
+    @TableField("file_key")
     private String fileKey;
 
     /**
      * 文件标识名称
      */
-	@TableField("file_key_name")
+    @TableField("file_key_name")
     private String fileKeyName;
 
     /**
      * 文件对象
      */
-	@TableField("file_url")
-    private String fileUrl;
+    @TableField(value = "file_url", typeHandler = FastjsonTypeHandler.class)
+    private List<Object> fileUrl;
 
     /**
      * 有效开始时间
      */
-	@TableField("effective_date_start")
+    @TableField("effective_date_start")
     private Date effectiveDateStart;
 
     /**
      * 有效结束时间
      */
-	@TableField("effective_date_end")
+    @TableField("effective_date_end")
     private Date effectiveDateEnd;
 
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.yeejoin.amos.boot.module.hygf.api.dto.MaintenanceDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.Maintenance;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
 
 /**
  * 运维人员 Mapper 接口
@@ -11,6 +17,24 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MaintenanceMapper extends BaseMapper<Maintenance> {
 
+
     public  void updateTraining(String userId);
 
+    //验证平台手机号验证平台账号
+
+    public Integer selectauthLogininfo(@Param("telephone")String telephone,@Param("adminLoginName")String adminLoginName);
+
+    //验证运维人员手机号账号
+
+    public Integer selectMaintenance(@Param("telephone")String telephone,@Param("adminLoginName")String adminLoginName);
+
+    //列表
+    List<MaintenanceDto> Maintenancepage(@Param("name")String name, @Param("maintenanceTypeCode")String maintenanceTypeCode,
+                                         @Param("lockStatus")String lockStatus, @Param("reviewStatus")String reviewStatus,
+                                         @Param("regionalCompaniesSeq")Long regionalCompaniesSeq, @Param("dealerId") Long dealerId);
+
+
+    //详情
+    MaintenanceDto  selectOneById( @Param("sequenceNbr")Long sequenceNbr  );
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/MaintenanceUtil.java

+package com.yeejoin.amos.boot.module.hygf.api.util;
+
+import java.util.HashMap;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/3/12
+ */
+public class MaintenanceUtil {
+    //"培训状态"
+    public static final String YPX= "已培训";
+    public static final String WPX= "未培训";
+
+    //"审核状态"
+    public static final String SHZ="审核中";
+    public static final String TG="通过";
+    public static final String BH="驳回";
+
+    //"是否锁定"
+    public static final String OK="是";
+    public static final String NO="否";
+
+
+
+
+
+}

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

@@ -7,4 +7,96 @@
         select  sequence_nbr from  std_user_biz where amos_user_id = #{userId}
     ) and is_delete = 0
     </update>
+
+
+
+    <select id="selectauthLogininfo" resultType="INT">
+
+
+    select COUNT(privilege_agency_user.SEQUENCE_NBR ) from  privilege_agency_user where
+    privilege_agency_user.MOBILE=#{telephone}
+    or privilege_agency_user.USER_NAME=#{telephone}
+    or privilege_agency_user.USER_NAME=#{adminLoginName}
+
+
+</select>
+    <select id="selectMaintenance" resultType="INT">
+    select COUNT(hygf_maintenance.SEQUENCE_NBR ) from  hygf_maintenance where
+    hygf_maintenance.review_status!='驳回'
+    and  hygf_maintenance.telephone=#{telephone}
+    or privilege_agency_user.admin_login_name=#{adminLoginName}
+</select>
+
+
+    <select id="Maintenancepage" 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
+
+            <if test="name != null and name != ''">
+                AND ph.name LIKE CONCAT('%', #{name}, '%')
+            </if>
+
+            <if test="maintenanceTypeCode != null and maintenanceTypeCode != ''">
+                AND ph.maintenance_type_code = #{maintenanceTypeCode}
+            </if>
+            <if test="lockStatus != null and lockStatus != ''">
+                AND ph.lock_status &gt;= #{lockStatus}
+            </if>
+            <if test="reviewStatus != null and reviewStatus != ''">
+                AND ph.review_status &gt;= #{reviewStatus}
+            </if>
+
+            <if test="regionalCompaniesSeq != null and regionalCompaniesSeq != ''">
+                AND ph.regional_companies_seq &gt;= #{regionalCompaniesSeq}
+            </if>
+            <if test="dealerId != null and dealerId != ''">
+                AND ph.dealer_id &gt;= #{dealerId}
+            </if>
+
+        </where>
+
+
+    </select>
+
+
+
+    <select id="selectOneById" 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,
+        std_user_biz.lock_status   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.sequence_nbr=#{sequenceNbr}
+
+    </select>
 </mapper>

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

 package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
+import com.yeejoin.amos.boot.module.hygf.api.entity.Maintenance;
+import com.yeejoin.amos.boot.module.hygf.api.entity.MaintenanceLog;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -37,28 +39,28 @@ public class MaintenanceController extends BaseController {
      * @return
      */
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PostMapping(value = "/save")
-	@ApiOperation(httpMethod = "POST", value = "新增运维人员", notes = "新增运维人员")
-	public ResponseModel<MaintenanceDto> save(@RequestBody MaintenanceDto model) {
-	    model = maintenanceServiceImpl.save(model);
-	    return ResponseHelper.buildResponse(model);
-	}
-
-	/**
+    @PostMapping(value = "/save")
+    @ApiOperation(httpMethod = "POST", value = "新增运维人员", notes = "新增运维人员")
+    public ResponseModel<Maintenance> save(@RequestBody Maintenance model) {
+        model = maintenanceServiceImpl.saveMaintenance(model);
+        return ResponseHelper.buildResponse(model);
+    }
+
+    /**
      * 根据sequenceNbr更新
      *
      * @param sequenceNbr 主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@PutMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新运维人员", notes = "根据sequenceNbr更新运维人员")
-	public ResponseModel<MaintenanceDto> updateBySequenceNbrMaintenance(@RequestBody MaintenanceDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
-	    model.setSequenceNbr(sequenceNbr);
-	    return ResponseHelper.buildResponse(maintenanceServiceImpl.updateWithModel(model));
-	}
-
-	/**
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新运维人员", notes = "根据sequenceNbr更新运维人员")
+    public ResponseModel<MaintenanceDto> updateBySequenceNbrMaintenance(@RequestBody MaintenanceDto model,@PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        model.setSequenceNbr(sequenceNbr);
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.updateWithModel(model));
+    }
+
+    /**
      * 根据sequenceNbr删除
      *
      * @param sequenceNbr 主键
@@ -74,43 +76,61 @@ public class MaintenanceController extends BaseController {
     /**
      * 根据sequenceNbr查询
      *
-	 * @param sequenceNbr  主键
+     * @param sequenceNbr  主键
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/{sequenceNbr}")
-	@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个运维人员",  notes = "根据sequenceNbr查询单个运维人员")
-	public ResponseModel<MaintenanceDto> selectOne(@PathVariable Long sequenceNbr) {
-	    return ResponseHelper.buildResponse(maintenanceServiceImpl.queryBySeq(sequenceNbr));
-	}
-
-	/**
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/{sequenceNbr}")
+    @ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个运维人员",  notes = "根据sequenceNbr查询单个运维人员")
+    public ResponseModel<MaintenanceDto> selectOne(@PathVariable Long sequenceNbr) {
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.selectOneById(sequenceNbr));
+    }
+
+    /**
      * 列表分页查询
      *
      * @param current 当前页
      * @param current 每页大小
      * @return
      */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@GetMapping(value = "/page")
-	@ApiOperation(httpMethod = "GET",value = "运维人员分页查询",  notes = "运维人员分页查询")
-	public ResponseModel<Page<MaintenanceDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
-	    Page<MaintenanceDto> page = new Page<MaintenanceDto>();
-	    page.setCurrent(current);
-	    page.setSize(size);
-	    return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenancePage(page));
-	}
-
-	/**
-	 * 列表全部数据查询
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/page")
+    @ApiOperation(httpMethod = "GET",value = "运维人员分页查询",  notes = "运维人员分页查询")
+    public ResponseModel<Page<MaintenanceDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
+            (value = "size") int size,
+                                                         @RequestParam(required = false) String name,
+                                                         @RequestParam(required = false)String maintenanceTypeCode,
+                                                         @RequestParam(required = false) String lockStatus,
+                                                         @RequestParam(required = false)String reviewStatus,
+                                                         @RequestParam(required = false)Long regionalCompaniesSeq,
+                                                         @RequestParam(required = false)Long dealerId
+    ) {
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenancePage( current, size, name, maintenanceTypeCode,lockStatus,reviewStatus,regionalCompaniesSeq,dealerId));
+    }
+
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping (value = "examine/{sequenceNbr}")
+    @ApiOperation(httpMethod = "post",value = "审核单个运维人员",  notes = "审核单个运维人员")
+    public ResponseModel<Maintenance> examine(@PathVariable Long sequenceNbr,@RequestBody MaintenanceLog maintenanceLog) {
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.examine(sequenceNbr,maintenanceLog));
+    }
+
+
+
+
+
+
+    /**
+     * 列表全部数据查询
      *
-	 * @return
-	 */
-	@TycloudOperation(ApiLevel = UserType.AGENCY)
-	@ApiOperation(httpMethod = "GET",value = "运维人员列表全部数据查询",   notes = "运维人员列表全部数据查询")
-	@GetMapping(value = "/list")
-	public ResponseModel<List<MaintenanceDto>> selectForList() {
-	    return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenanceList());
-	}
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "运维人员列表全部数据查询",   notes = "运维人员列表全部数据查询")
+    @GetMapping(value = "/list")
+    public ResponseModel<List<MaintenanceDto>> selectForList() {
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenanceList());
+    }
 }