Merge branch 'master' of http://129.211.99.254:8088/hg-hubin/long-tern-care-service

common/common-core/src/main/java/com/hungraim/ltc/pojo/entity/serviceManage/ChAprOrgan.java

+package com.hungraim.ltc.pojo.entity.serviceManage;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * CH_APR_ORGAN
+ *
+ * @author
+ */
+@Data
+@TableName("CH_APR_ORGAN")
+@KeySequence("SEQ_CH_APR_ORGAN")
+public class ChAprOrgan implements Serializable {
+    /**
+     * 鉴定机构id
+     */
+    @TableId(type = IdType.INPUT)
+    private Long aprOrganId;
+
+    /**
+     * 鉴定机构代码
+     */
+    private String organCode;
+
+    /**
+     * 鉴定机构名称
+     */
+    private String organName;
+
+    /**
+     * 创建人
+     */
+    private Long defineEmp;
+
+    /**
+     * 创建时间
+     */
+    private Date effTime;
+
+    /**
+     * 终止人
+     */
+    private Long endEmp;
+
+    /**
+     * 终止时间
+     */
+    private Date endTime;
+
+    /**
+     * 首次操作时间
+     */
+    private Date fcd;
+
+    /**
+     * 首次操作人
+     */
+    private Long fcu;
+
+    /**
+     * 末次操作时间
+     */
+    private Date lcd;
+
+    /**
+     * 末次操作人
+     */
+    private Long lcu;
+
+    /**
+     * 适用机构ID
+     */
+    private String organId;
+
+    /**
+     * 所在城市
+     */
+    private String districtCity;
+
+    /**
+     * 所在区域
+     */
+    private String districtArea;
+
+    /**
+     * 所在省份
+     */
+    private String districtProvincial;
+
+    /**
+     * 登记号
+     */
+    private String permitNo;
+
+    /**
+     * 服务配置模式ID
+     */
+    private Long cfgModeId;
+
+    /**
+     * 鉴定机构类型ID
+     */
+    private Long organTypeId;
+
+    /**
+     * 鉴定机构类型名称
+     */
+    private String organTypeName;
+
+    /**
+     * 接受鉴定省
+     */
+    private String acptProvincial;
+
+    /**
+     * 接受鉴定市
+     */
+    private String acptCity;
+
+    /**
+     * 接受鉴定区
+     */
+    private String acptArea;
+
+    /**
+     * 接受鉴定街道
+     */
+    private String acptStreet;
+
+    /**
+     * 接受鉴定详细地址
+     */
+    private String acptAddress;
+
+    /**
+     * 联系人
+     */
+    private String linkName;
+
+    /**
+     * 联系电话
+     */
+    private String linkTel;
+
+    private Short dataFrom;
+
+    /**
+     * 状态 有效：0,作废：1
+     */
+    private Short status;
+
+    /**
+     * 统一社会信用代码
+     */
+    private String unifiedSocialCreditCode;
+
+    /**
+     * 银行账户名称
+     */
+    private String accName;
+
+    /**
+     * 银行开户行名称
+     */
+    private String bankAccName;
+
+    /**
+     * 银行账号
+     */
+    private String bankNo;
+
+    /**
+     * 联系人邮箱
+     */
+    private String linkMail;
+
+    /**
+     * 评定起点地址id
+     */
+    private Long groupDetailId;
+
+    /**
+     * 接受鉴定地址经度
+     */
+    private String acptLongitude;
+
+    /**
+     * 接受鉴定地址纬度
+     */
+    private String acptLatitude;
+
+    /**
+     * 接受鉴定路街
+     */
+    private String acptRoadDetail;
+
+    /**
+     * 接受鉴定路/街 （0路，1街，2村）
+     */
+    private Short acptRoadType;
+
+    /**
+     * 接受鉴定号弄
+     */
+    private String acptNumberDetail;
+
+    /**
+     * 接受鉴定号/弄 （0弄，1号）
+     */
+    private Short acptNumberType;
+
+    /**
+     * 银行开户名称代码
+     */
+    private String bankAccCode;
+
+    /**
+     * 账号所属省
+     */
+    private String bankDistrictProvincial;
+
+    /**
+     * 账号所属市
+     */
+    private String bankDistrictCity;
+
+    /**
+     * 账号所属网点
+     */
+    private String bankDistrictWebsite;
+
+    /**
+     * 卡类型
+     */
+    private Long cardType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 审核人姓名（长护）
+     */
+    private String checkNameCh;
+
+    /**
+     * 审核备注（长护）
+     */
+    private String checkRemarkCh;
+
+    /**
+     * 审核时间（长护）
+     */
+    private Date checkTimeCh;
+
+    /**
+     * 审核状态（长护 待审核:0,审核中：1，审核通过:2,审核不通过:3）
+     */
+    private Short checkStatusCh;
+
+    /**
+     * 审核人姓名（理赔）
+     */
+    private String checkNameLp;
+
+    /**
+     * 审核备注（理赔）
+     */
+    private String checkRemarkLp;
+
+    /**
+     * 审核时间（理赔）
+     */
+    private Date checkTimeLp;
+
+    /**
+     * 审核状态（理赔 待审核:0,审核中：1，审核通过:2,审核不通过:3）
+     */
+    private Short checkStatusLp;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/AprOrganVO.java

+package com.hungraim.ltc.pojo.vo.governance;
+
+import lombok.Data;
+
+/**
+ * 评定机构信息列表VO
+ */
+@Data
+public class AprOrganVO {
+    /**
+     * 评定机构id
+     */
+    private String aprOrganId;
+    /**
+     * 适用机构
+     */
+    private String organName;
+    /**
+     * 机构代码
+     */
+    private String organCode;
+    /**
+     * 所在省市
+     */
+    private String districtProvincial;
+    private String districtCity;
+    private String districtArea;
+    /**
+     * 评定机构名称
+     */
+    private String aprOrganName;
+    /**
+     * 统一社会信用代码
+     */
+    private String unifiedSocialCreditCode;
+    /**
+     * 机构类型
+     */
+    private String organType;
+    /**
+     * 机构地址
+     */
+    private String acptProvincial;//省
+    private String acptCity;//市
+    private String acptArea;//区
+    private String acptStreet;//街道
+    private String acptAddress;//详细地址
+    /**
+     * 机构联系人姓名
+     */
+    private String linkName;
+    /**
+     * 机构联系人手机号
+     */
+    private String linkTel;
+}

governance/src/main/java/com/hungraim/ltc/governance/controller/AprOrganController.java

+package com.hungraim.ltc.governance.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.governance.service.AprOrganService;
+import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
+import com.hungraim.ltc.util.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 评定机构及评定机构人员信息管理Controller
+ *
+ * @author czz
+ */
+@RestController
+@RequestMapping("/api.governance/organ")
+@Slf4j
+public class AprOrganController {
+
+    @Autowired
+    private AprOrganService aprOrganService;
+
+    /**
+     * 评定机构信息列表
+     *
+     * @param pageNum   页码
+     * @param pageSize  每页展示条数
+     * @param organIds  适用机构id
+     * @param organName 机构名称
+     * @param code      统一社会信用代码
+     */
+    @RequestMapping("/aprOrganList")
+    public Result<Page<AprOrganVO>> aprOrganList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
+                                                 String organIds, String organName, String code) {
+        Page<AprOrganVO> page = new Page<>(pageNum, pageSize);
+        page = aprOrganService.aprOrganList(page, organIds, organName, code);
+        return Result.success(page);
+    }
+
+}

governance/src/main/java/com/hungraim/ltc/governance/controller/SuperviseOrganEmpController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 /**
- * 监管机构人员信息管理Controller
+ * 监管机构及监管机构人员信息管理Controller
  *
  * @author czz
  */

governance/src/main/java/com/hungraim/ltc/governance/dao/AprOrganMapper.java

+package com.hungraim.ltc.governance.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.entity.serviceManage.ChAprOrgan;
+import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface AprOrganMapper extends BaseMapper<ChAprOrgan> {
+    Page<AprOrganVO> aprOrganList(Page<AprOrganVO> page, List<String> organIds, String organName, String code);
+}

governance/src/main/java/com/hungraim/ltc/governance/service/AprOrganService.java

+package com.hungraim.ltc.governance.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
+import org.springframework.stereotype.Service;
+
+/**
+ * 监管机构及监管机构人员信息管理Service
+ *
+ * @author czz
+ */
+@Service
+public interface AprOrganService {
+    Page<AprOrganVO> aprOrganList(Page<AprOrganVO> page, String organIds, String organName, String code);
+}

governance/src/main/java/com/hungraim/ltc/governance/service/impl/AprOrganServiceImpl.java

+package com.hungraim.ltc.governance.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.hungraim.ltc.governance.dao.AprOrganMapper;
+import com.hungraim.ltc.governance.service.AprOrganService;
+import com.hungraim.ltc.pojo.vo.governance.AprOrganVO;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.List;
+
+
+@Service
+@Slf4j
+@AllArgsConstructor
+public class AprOrganServiceImpl implements AprOrganService {
+
+    private final AprOrganMapper aprOrganMapper;
+
+    @Override
+    public Page<AprOrganVO> aprOrganList(Page<AprOrganVO> page, String organId, String organName, String code) {
+        List<String> organIds = null;
+        if (StrUtil.isNotBlank(organId)) {
+            organIds = Arrays.asList(organId.split(","));
+        }
+        return aprOrganMapper.aprOrganList(page, organIds, organName, code);
+    }
+}

governance/src/main/resources/com/hungraim/ltc/governance/mapper/AprOrganMapper.xml

+<?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.hungraim.ltc.governance.dao.AprOrganMapper">
+
+    <!--监管机构人员信息列表-->
+    <select id="aprOrganList" resultType="com.hungraim.ltc.pojo.vo.governance.AprOrganVO">
+        SELECT--评定机构id
+        organ.APR_ORGAN_ID aprOrganId,
+        --适用机构
+        srvOrgan.srv_organ_name organName,
+        --机构代码
+        organ.ORGAN_CODE organCode,
+        --所在省市区
+        organ.DISTRICT_PROVINCIAL districtProvincial,
+        organ.district_city districtCity,
+        organ.district_area districtArea,
+        --评定机构名称
+        organ.ORGAN_NAME aprOrganName,
+        --统一社会信用代码
+        organ.UNIFIED_SOCIAL_CREDIT_CODE unifiedSocialCreditCode,
+        --机构类型
+        organ.ORGAN_TYPE_ID organType,
+        --统一社会信用代码
+        organ.UNIFIED_SOCIAL_CREDIT_CODE unifiedSocialCreditCode,
+        --机构类型
+        organType.ORGAN_TYPE_NAME organType,
+        --机构地址
+        organ.ACPT_PROVINCIAL acptProvincial,
+        organ.ACPT_CITY acptCity,
+        organ.ACPT_AREA acptArea,
+        organ.ACPT_STREET acptStreet,
+        organ.ACPT_ADDRESS acptAddress,
+        --机构联系人姓名
+        organ.LINK_NAME linkName,
+        --银行账号
+        organ.LINK_TEL linkTel
+        FROM
+        --鉴定机构表
+        CH_APR_ORGAN organ
+        --护理机构
+        LEFT JOIN ch_srv_organ srvOrgan ON organ.organ_id = srvOrgan.organ_id
+        --鉴定机构类型表
+        LEFT JOIN CH_CFG_APR_ORGAN_TYPE organType ON organ.ORGAN_TYPE_ID = organType.ORGAN_TYPE_ID
+        where organ.STATUS = 0
+        <if test="organIds != null">
+            and organ.organ_id in
+            <foreach collection="organIds" item="organId" open="(" close=")" separator=",">
+                #{organId}
+            </foreach>
+        </if>
+        <if test="organName != null and organName != ''">
+            and organ.ORGAN_NAME LIKE CONCAT('%',CONCAT( #{organName} ,'%'))
+        </if>
+        <if test="code != null and code != ''">
+            and organ.UNIFIED_SOCIAL_CREDIT_CODE = #{code}
+        </if>
+    </select>
+</mapper>
\ No newline at end of file

governance/src/main/resources/com/hungraim/ltc/governance/mapper/SuperviseOrganEmpMapper.xml

@@ -27,9 +27,12 @@
         --状态 有效：0；失效：1
         emp.IS_LOCK isLock
         FROM
-        ch_supervise_organ_emp emp --监管人员信息
-        LEFT JOIN ch_supervise_organ sOrgan ON emp.spv_organ_id = sOrgan.spv_organ_id --监管机构
-        LEFT JOIN ch_srv_organ organ ON sOrgan.organ_id = organ.organ_id --护理机构
+        --监管人员信息
+        ch_supervise_organ_emp emp
+        --监管机构
+        LEFT JOIN ch_supervise_organ sOrgan ON emp.spv_organ_id = sOrgan.spv_organ_id
+        --护理机构
+        LEFT JOIN ch_srv_organ organ ON sOrgan.organ_id = organ.organ_id
         <where>
             <if test="organIds != null">
                 and organ.SRV_ORGAN_ID in
@@ -49,7 +52,7 @@
             <if test="superviseTel != null and superviseTel != ''">
                 and emp.MOBILE_PHONE = #{superviseTel}
             </if>
-            <if test='status != null and status == "1"'>
+            <if test='status != null and status != ""'>
                 and emp.IS_LOCK = #{status}
             </if>
         </where>