小程序协议

zhouxiantao

2024-09-14 47488a7bf69c5cdae18e80a616ec0a43e890765d

小程序协议

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/dao/mapper/xml/CaseInfoMapper.xml

@@ -94,8 +94,8 @@
        <result property="inputUnitName" column="input_unit_name"/>
        <result property="mediResult" column="medi_result"/>
        <result property="mediResultName" column="medi_result_name"/>
        <result property="mediateDeptId" column="mediate_dept_id"/>
        <result property="mediateDeptName" column="mediate_dept_name"/>
        <result property="mediateUnitId" column="mediate_unit_id"/>
        <result property="mediateUnitName" column="mediate_unit_name"/>
        <result property="assistUnitId" column="assist_unit_id"/>
        <result property="assistUnitName" column="assist_unit_name"/>
        <result property="closeTime" column="close_time"/>
@@ -118,8 +118,8 @@
        a.input_unit_name,
        b.medi_result,
        b.medi_result_name,
        b.mediate_dept_id,
        b.mediate_dept_name,
        b.mediate_unit_id,
        b.mediate_unit_name,
        b.assist_unit_id,
        b.assist_unit_name,
        b.close_time,

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CaseInfoWeExcelDTO.java

@@ -18,7 +18,7 @@
    @ExcelProperty(value="纠纷类型")
    private String caseTypeName;
    @ExcelProperty(value="承办部门")
    private String mediateDeptName;
    private String mediateUnitName;
    @ExcelProperty(value="配合部门")
    private String assistUnitName;
    @ExcelProperty(value="化解结果")

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/domain/dto/CasePageDTO.java

@@ -61,12 +61,12 @@
    /**
     * 实际调解部门编号(承办部门)
     */
    private String mediateDeptId;
    private String mediateUnitId;

    /**
     * 实际调解部门名称(承办部门)
     */
    private String mediateDeptName;
    private String mediateUnitName;

    /**
     * 实际调解部门编号(配合部门)

 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java

@@ -804,8 +804,8 @@
                if(ObjectUtils.isNotEmpty(caseInfoUnfold)){
                    caseInfoWeChatDTO.setMediResult(caseInfoUnfold.getMediResult());
                    caseInfoWeChatDTO.setMediResultName(caseInfoUnfold.getMediResultName());
                    caseInfoWeChatDTO.setMediateDeptId(caseInfoUnfold.getMediateDeptId());
                    caseInfoWeChatDTO.setMediateDeptName(caseInfoUnfold.getMediateDeptName());
                    caseInfoWeChatDTO.setMediateDeptId(caseInfoUnfold.getMediateUnitId());
                    caseInfoWeChatDTO.setMediateDeptName(caseInfoUnfold.getMediateUnitName());
                    caseInfoWeChatDTO.setAgreeType(caseInfoUnfold.getAgreeType());
                    caseInfoWeChatDTO.setAgreeTypeName(caseInfoUnfold.getAgreeTypeName());
                    caseInfoWeChatDTO.setAgreeContent(caseInfoUnfold.getAgreeContent());

 dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/FileInfoMapper.java

@@ -76,4 +76,11 @@
     * @return List<FileRelate>
     */
    List<FileInfo> listFile(@Param("terms") Map<String, Object> terms);

    /**
     * 根据多个编号查询
     * @param terms
     * @return List<FileRelate>
     */
    List<FileInfo> listFileByType(@Param("terms") Map<String, Object> terms);
}

 dyh-service/dyh-sys/src/main/java/cn/huge/module/file/dao/mapper/xml/FileInfoMapper.xml

@@ -319,6 +319,18 @@
        </if>
    </select>

    <select id="listFileByType" resultMap="fileResult">
        SELECT t2.owner_id, t2.owner_cat, t2.owner_type, t2.uploader_id, t2.uploader_name,
        <include refid="column-part-t"/>
        FROM dyh_file_info t1
        LEFT JOIN dyh_file_relate t2 ON t1.id = t2.file_id
        WHERE
        t1.delete_status = 0
        and t2.main_id = #{terms.mainId}
        and t2.owner_type = #{terms.ownerType}
    </select>


<!--    &lt;!&ndash; 根据多个编号查询 &ndash;&gt;-->
<!--    <select id="listByIdsTypes" resultMap="fileResult">-->
<!--        SELECT t2.owner_id, t2.owner_cat, t2.owner_type, t2.uploader_id, t2.uploader_name,-->

 dyh-service/dyh-sys/src/main/java/cn/huge/module/file/service/FileInfoService.java

@@ -506,8 +506,8 @@
        List<FileInfoBaseDTO> fileList = new ArrayList<>();
        Map<String, Object> terms = new HashMap<>();
        terms.put("mainId", mainId);
        terms.put("types", ownerType);
        List<FileInfo> fileInfoList = mapper.listFile(terms);
        terms.put("ownerType", ownerType);
        List<FileInfo> fileInfoList = mapper.listFileByType(terms);
        if(CollectionUtils.isNotEmpty(fileInfoList)){
            for (FileInfo fileInfo : fileInfoList) {
                FileInfoBaseDTO fileInfoBaseDTO = new FileInfoBaseDTO();