forked from gzzfw/backEnd/gz-dyh

liyj
2024-09-24 d4776113950b58d447bc3cfc5ed57ab4d8e1ee3e
1、大厅来访登记,添加当事人法人信息,选择企业接口2
8 files modified
83 ■■■■ changed files
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CasePersonWebController.java 16 ●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CasePersonMapper.xml 16 ●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/bo/CasePersonBO.java 4 ●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CasePerson.java 12 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/dao/mapper/xml/CasedraftPersonMapper.xml 17 ●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/domain/po/CasedraftPerson.java 12 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java 1 ●●●● patch | view | raw | blame | history
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/CasePersonDTO.java 5 ●●●●● patch | view | raw | blame | history
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/controller/web/CasePersonWebController.java
@@ -22,8 +22,8 @@
 * @title: 纠纷当事人信息表接口api-web端
 * @description: 纠纷当事人信息表接口api-web端
 * @company: hugeinfo
 * @author: wangwh
 * @time: 2024-08-27 10:48:18
 * @author: liyj
 * @time: 2024-09-24 14:18:41
 * @version: 1.0.0
 */
@Slf4j
@@ -48,7 +48,7 @@
        if (StringUtils.isNotBlank(id)){
            terms.put("id", id);
        }
        // 纠纷编号
        // 纠纷信息编号
        String caseId = request.getParameter("caseId");
        if (StringUtils.isNotBlank(caseId)){
            terms.put("caseId", caseId);
@@ -57,6 +57,11 @@
        String partyUserId = request.getParameter("partyUserId");
        if (StringUtils.isNotBlank(partyUserId)){
            terms.put("partyUserId", partyUserId);
        }
        // 企业信息编号
        String companyId = request.getParameter("companyId");
        if (StringUtils.isNotBlank(companyId)){
            terms.put("companyId", companyId);
        }
        // 当事人地位
        String perType = request.getParameter("perType");
@@ -233,6 +238,11 @@
        if (StringUtils.isNotBlank(placeAddr)){
            terms.put("placeAddr", placeAddr);
        }
        // 工作单位编号
        String workUnitId = request.getParameter("workUnitId");
        if (StringUtils.isNotBlank(workUnitId)){
            terms.put("workUnitId", workUnitId);
        }
        // 工作单位
        String workUnit = request.getParameter("workUnit");
        if (StringUtils.isNotBlank(workUnit)){
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CasePersonMapper.xml
@@ -4,8 +4,8 @@
 * @title: 纠纷当事人信息表
 * @description: 自定义sql,请自行实现业务逻辑
 * @company: hugeinfo
 * @author: wangwh
 * @time:2024-08-27 10:48:18
 * @author: liyj
 * @time:2024-09-24 14:18:41
 * @version 1.0.0
-->
<mapper namespace="cn.huge.module.cases.dao.mapper.CasePersonMapper">
@@ -14,6 +14,7 @@
            <result property="id" column="id"/>
            <result property="caseId" column="case_id"/>
            <result property="partyUserId" column="party_user_id"/>
            <result property="companyId" column="company_id"/>
            <result property="perType" column="per_type"/>
            <result property="perTypeName" column="per_type_name"/>
            <result property="perClass" column="per_class"/>
@@ -49,6 +50,7 @@
            <result property="placeVillage" column="place_village"/>
            <result property="placeVillageName" column="place_village_name"/>
            <result property="placeAddr" column="place_addr"/>
            <result property="workUnitId" column="work_unit_id"/>
            <result property="workUnit" column="work_unit"/>
            <result property="nation" column="nation"/>
            <result property="nationName" column="nation_name"/>
@@ -73,6 +75,7 @@
        id,
        case_id,
        party_user_id,
        company_id,
        per_type,
        per_type_name,
        per_class,
@@ -108,6 +111,7 @@
        place_village,
        place_village_name,
        place_addr,
        work_unit_id,
        work_unit,
        nation,
        nation_name,
@@ -129,6 +133,7 @@
    <sql id="set-part">
            <if test="entity.caseId != null">case_id = #{entity.caseId},</if>
            <if test="entity.partyUserId != null">party_user_id = #{entity.partyUserId},</if>
            <if test="entity.companyId != null">company_id = #{entity.companyId},</if>
            <if test="entity.perType != null">per_type = #{entity.perType},</if>
            <if test="entity.perTypeName != null">per_type_name = #{entity.perTypeName},</if>
            <if test="entity.perClass != null">per_class = #{entity.perClass},</if>
@@ -164,6 +169,7 @@
            <if test="entity.placeVillage != null">place_village = #{entity.placeVillage},</if>
            <if test="entity.placeVillageName != null">place_village_name = #{entity.placeVillageName},</if>
            <if test="entity.placeAddr != null">place_addr = #{entity.placeAddr},</if>
            <if test="entity.workUnitId != null">work_unit_id = #{entity.workUnitId},</if>
            <if test="entity.workUnit != null">work_unit = #{entity.workUnit},</if>
            <if test="entity.nation != null">nation = #{entity.nation},</if>
            <if test="entity.nationName != null">nation_name = #{entity.nationName},</if>
@@ -193,6 +199,9 @@
                </if>
                <if test="terms.partyUserId != null and terms.partyUserId !=''">
                    and party_user_id = #{terms.partyUserId}
                </if>
                <if test="terms.companyId != null and terms.companyId !=''">
                    and company_id = #{terms.companyId}
                </if>
                <if test="terms.perType != null and terms.perType !=''">
                    and per_type = #{terms.perType}
@@ -299,6 +308,9 @@
                <if test="terms.placeAddr != null and terms.placeAddr !=''">
                    and place_addr = #{terms.placeAddr}
                </if>
                <if test="terms.workUnitId != null and terms.workUnitId !=''">
                    and work_unit_id = #{terms.workUnitId}
                </if>
                <if test="terms.workUnit != null and terms.workUnit !=''">
                    and work_unit = #{terms.workUnit}
                </if>
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/bo/CasePersonBO.java
@@ -6,8 +6,8 @@
 * @title: 纠纷当事人信息表业务扩展类
 * @description: 纠纷当事人信息表业务扩展类
 * @company: hugeinfo
 * @author: wangwh
 * @time: 2024-08-27 10:48:18
 * @author: liyj
 * @time: 2024-09-24 14:18:41
 * @version: 1.0.0
 * @see cn.huge.module.cases.domain.po.CasePerson
 */
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/po/CasePerson.java
@@ -41,6 +41,12 @@
    private String partyUserId;
    /**
    * 企业信息编号
    */
    @TableField(value = "company_id")
    private String companyId;
    /**
    * 当事人地位
    */
    @TableField(value = "per_type")
@@ -251,6 +257,12 @@
    private String placeAddr;
    /**
    * 工作单位编号
    */
    @TableField(value = "work_unit_id")
    private String workUnitId;
    /**
    * 工作单位
    */
    @TableField(value = "work_unit")
dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/dao/mapper/xml/CasedraftPersonMapper.xml
@@ -4,8 +4,8 @@
 * @title: 纠纷当事人信息草稿表
 * @description: 自定义sql,请自行实现业务逻辑
 * @company: hugeinfo
 * @author: wangwh
 * @time:2024-08-27 10:48:18
 * @author: liyj
 * @time:2024-09-24 14:23:44
 * @version 1.0.0
-->
<mapper namespace="cn.huge.module.draft.dao.mapper.CasedraftPersonMapper">
@@ -14,6 +14,7 @@
            <result property="id" column="id"/>
            <result property="caseId" column="case_id"/>
            <result property="partyUserId" column="party_user_id"/>
            <result property="companyId" column="company_id"/>
            <result property="perType" column="per_type"/>
            <result property="perTypeName" column="per_type_name"/>
            <result property="perClass" column="per_class"/>
@@ -49,6 +50,7 @@
            <result property="placeVillage" column="place_village"/>
            <result property="placeVillageName" column="place_village_name"/>
            <result property="placeAddr" column="place_addr"/>
            <result property="workUnitId" column="work_unit_id"/>
            <result property="workUnit" column="work_unit"/>
            <result property="nation" column="nation"/>
            <result property="nationName" column="nation_name"/>
@@ -72,6 +74,7 @@
        id,
        case_id,
        party_user_id,
        company_id,
        per_type,
        per_type_name,
        per_class,
@@ -107,6 +110,7 @@
        place_village,
        place_village_name,
        place_addr,
        work_unit_id,
        work_unit,
        nation,
        nation_name,
@@ -127,6 +131,7 @@
    <sql id="set-part">
            <if test="entity.caseId != null">case_id = #{entity.caseId},</if>
            <if test="entity.partyUserId != null">party_user_id = #{entity.partyUserId},</if>
            <if test="entity.companyId != null">company_id = #{entity.companyId},</if>
            <if test="entity.perType != null">per_type = #{entity.perType},</if>
            <if test="entity.perTypeName != null">per_type_name = #{entity.perTypeName},</if>
            <if test="entity.perClass != null">per_class = #{entity.perClass},</if>
@@ -162,6 +167,7 @@
            <if test="entity.placeVillage != null">place_village = #{entity.placeVillage},</if>
            <if test="entity.placeVillageName != null">place_village_name = #{entity.placeVillageName},</if>
            <if test="entity.placeAddr != null">place_addr = #{entity.placeAddr},</if>
            <if test="entity.workUnitId != null">work_unit_id = #{entity.workUnitId},</if>
            <if test="entity.workUnit != null">work_unit = #{entity.workUnit},</if>
            <if test="entity.nation != null">nation = #{entity.nation},</if>
            <if test="entity.nationName != null">nation_name = #{entity.nationName},</if>
@@ -190,6 +196,9 @@
                </if>
                <if test="terms.partyUserId != null and terms.partyUserId !=''">
                    and party_user_id = #{terms.partyUserId}
                </if>
                <if test="terms.companyId != null and terms.companyId !=''">
                    and company_id = #{terms.companyId}
                </if>
                <if test="terms.perType != null and terms.perType !=''">
                    and per_type = #{terms.perType}
@@ -295,6 +304,9 @@
                </if>
                <if test="terms.placeAddr != null and terms.placeAddr !=''">
                    and place_addr = #{terms.placeAddr}
                </if>
                <if test="terms.workUnitId != null and terms.workUnitId !=''">
                    and work_unit_id = #{terms.workUnitId}
                </if>
                <if test="terms.workUnit != null and terms.workUnit !=''">
                    and work_unit = #{terms.workUnit}
@@ -420,4 +432,5 @@
        <include refid="table-name" />
        where case_id = #{caseId}
    </select>
</mapper> 
dyh-service/dyh-mediate/src/main/java/cn/huge/module/draft/domain/po/CasedraftPerson.java
@@ -41,6 +41,12 @@
    private String partyUserId;
    /**
     * 企业信息编号
     */
    @TableField(value = "company_id")
    private String companyId;
    /**
    * 当事人地位
    */
    @TableField(value = "per_type")
@@ -251,6 +257,12 @@
    private String placeAddr;
    /**
     * 工作单位编号
     */
    @TableField(value = "work_unit_id")
    private String workUnitId;
    /**
    * 工作单位
    */
    @TableField(value = "work_unit")
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/web/GridCompanyWebController.java
@@ -52,6 +52,7 @@
            Page<GridCompanyDTO.UnitDTO> unitDTOPage = gridCompanyService.pageQuery(gridCompanyVo);
            for (GridCompanyDTO.UnitDTO unitDTO: unitDTOPage){
                CasePersonDTO casePersonDTO = new CasePersonDTO();
                casePersonDTO.setCompanyId(unitDTO.getId());
                casePersonDTO.setTrueName(unitDTO.getName());
                casePersonDTO.setOrgaCode(unitDTO.getSocialCreditCode());
                casePersonDTO.setAddr(unitDTO.getBusinessRegAddress());
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/dto/CasePersonDTO.java
@@ -23,6 +23,11 @@
public class CasePersonDTO {
    /**
    * 机构编号
    */
    private String companyId;
    /**
    * 姓名/企业/机构名称
    */
    private String trueName;