Merge branch 'bgy' of SH-Arbitrate/Arbitrate-Backend into dev

2024-04-28 13:57:10 +08:00
parent d05a943e66 2f3b5645aa
commit c22b16e7ac
15 changed files with 37 additions and 27 deletions
@@ -39,6 +39,11 @@
            <artifactId>mapper-spring-boot-starter</artifactId>
            <version>2.1.5</version>
        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.22</version>
+        </dependency>
    </dependencies>

 </project>
@@ -28,7 +28,7 @@ public class ArbitrateRecord     extends BaseEntity {
    /** 仲裁员审核裁决书意见 */
    private String arbitraCheckOpinion;
    /** 裁决书附件id */
-    private Integer annexId;
+    private Long annexId;

    /** 被申请人是否缺席 */
    private Integer isAbsence;
@@ -1,19 +1,20 @@
 package com.ruoyi.wisdomarbitrate.domain;

+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

-@Data
@Builder
+@Data
@AllArgsConstructor
@NoArgsConstructor
 public class CaseAttach {
    /**
     * 附件id
     */
-    private Integer annexId;
+    private Long annexId;
    /**
     * 案件申请id
     */
@@ -34,7 +34,7 @@ public class CaseEvidenceDirectory extends BaseEntity {
    /**
     * 附件id
     */
-    private Integer annexId;
+    private Long annexId;

    /**
     * 级数
@@ -29,7 +29,7 @@ public class SealManage extends BaseEntity {
    /**
     * 附件id
     */
-    private Integer annexId;
+    private Long annexId;

    /**
     * 印章审核状态(0未通过,1通过)
@@ -30,7 +30,7 @@ public class CaseEvidenceDirectoryVO implements Serializable {
    /**
     * 附件id
     */
-    private Integer annexId;
+    private Long annexId;

    /**
     * 级数
@@ -105,11 +105,11 @@ public class CaseEvidenceDirectoryVO implements Serializable {
        this.evidenceName = evidenceName;
    }

-    public Integer getAnnexId() {
+    public Long getAnnexId() {
        return annexId;
    }

-    public void setAnnexId(Integer annexId) {
+    public void setAnnexId(Long annexId) {
        this.annexId = annexId;
    }

@@ -25,7 +25,7 @@ public interface CaseAttachMapper {

    List<CaseAttach> getCaseAttachByCaseIdAndType(CaseAttach caseAttach);

-    CaseAttach queryAnnexById(Integer annexId);
+    CaseAttach queryAnnexById(@Param("annexId")Long annexId);

    /**
     * 根据案件id和附件类型删除和上传类型
@@ -604,7 +604,7 @@ public class AdjudicationServiceImpl implements IAdjudicationService {
            int i = caseAttachMapper.save(caseAttach);
            if (i > 0) {
                if (arbitrateRecordSelect != null) {
-                    Integer annexId = caseAttach.getAnnexId();
+                    Long annexId = caseAttach.getAnnexId();
                    //将附件id保存到仲裁记录表里面
                    arbitrateRecordSelect.setAnnexId(annexId);
                    arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecordSelect);
@@ -35,6 +35,7 @@ import com.ruoyi.wisdomarbitrate.utils.UnZipFileUtils;
 import com.ruoyi.wisdomarbitrate.utils.ZipFileUtils;
 import com.tencentyun.TLSSigAPIv2;

+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -657,7 +658,7 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                            .annexType(annexType)
                            .build();
                    int i = caseAttachMapper.save(caseAttach);
-                    Integer annexId = caseAttach.getAnnexId();
+                    Long annexId = caseAttach.getAnnexId();

                    //保存到目录表
                    Long parentId = null;
@@ -1432,11 +1433,14 @@ public class CaseApplicationServiceImpl implements ICaseApplicationService {
                        if (CollectionUtil.isNotEmpty(filterList)) {
                            for (CaseAttach caseAttach : filterList) {
                                // 查询附件表
-                                CaseAttach attach = caseAttachMapper.queryAnnexById(caseAttach.getAnnexId());
+                                Long annexId = caseAttach.getAnnexId();
+                                CaseAttach attach = caseAttachMapper.queryAnnexById(annexId);
+                                if(attach!=null){
                                    attach.setCaseAppliLogId(caseApplication.getCaseLogId());
                                    caseAttachLogMapper.save(attach);
                                }
                            }
+                        }

                    }
                    // 插入案件columnValueLog自定义字段表
@@ -609,7 +609,7 @@ public class CaseArbitrateServiceImpl implements ICaseArbitrateService {
                int i = caseAttachMapper.save(caseAttach);
                if (i > 0) {
                    if (arbitrateRecord1 != null) {
-                        Integer annexId = caseAttach.getAnnexId();
+                        Long annexId = caseAttach.getAnnexId();
                        //将附件id保存到仲裁记录表里面
                        arbitrateRecord1.setAnnexId(annexId);
                        arbitrateRecordMapper.updataArbitrateRecord(arbitrateRecord1);
@@ -253,7 +253,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
                                int i1 = caseAttachMapper.save(caseAttach);
                                if (i1 > 0) {
                                    //将附件id保存到公章管理表里
-                                    Integer annexId1 = caseAttach.getAnnexId();
+                                    Long annexId1 = caseAttach.getAnnexId();
                                    SealManage sealManage = new SealManage();
                                    sealManage.setSealId(sealId);
                                    List<SealManage> selectSealList = sealManageMapper.selectSealList(sealManage);
@@ -287,7 +287,7 @@ public class DeptIdentifyServiceImpl implements IDeptIdentifyService {
        List<SealManage> selectSealList = sealManageMapper.selectSealList(sealManage);
        if (selectSealList != null && selectSealList.size() > 0) {
            for (SealManage sealManage1 : selectSealList) {
-                Integer annexId = sealManage1.getAnnexId();
+                Long annexId = sealManage1.getAnnexId();
                if (annexId != null) {
                    //根据附件id查询路径
                    CaseAttach caseAttach = caseAttachMapper.queryAnnexById(annexId);
@@ -243,7 +243,7 @@ public class FixSelectFlowDetailUtils {
                                                    //将印章信息保存到公章管理表里
                                                    String sealName1 = sealName.substring(1, sealName.length() - 1);
                                                    String sealId1 = sealId.substring(1, sealId.length() - 1);
-                                                    Integer annexId1 = caseAttach.getAnnexId();
+                                                    Long annexId1 = caseAttach.getAnnexId();
                                                    sealManage.setAnnexId(annexId1);
                                                    sealManage.setSealId(sealId1);
                                                    sealManage.setSealName(sealName1);
@@ -287,7 +287,7 @@ public class FixSelectFlowDetailUtils {
            if (sealManageList != null && sealManageList.size() > 0) {
                for (SealManage sealManage1 : sealManageList) {
                    //查询企业内部印章
-                    Integer annexId = sealManage1.getAnnexId();
+                    Long annexId = sealManage1.getAnnexId();
                    String sealId = sealManage1.getSealId();
                    DeptIdentify deptIdentify = new DeptIdentify();
                    deptIdentify.setId(sealManage1.getIdentifyId());
@@ -336,7 +336,7 @@ public class FixSelectFlowDetailUtils {
                                        int i1 = caseAttachMapper.save(caseAttach);
                                        if (i1 > 0) {
                                            //将附件id保存到公章管理表里
-                                            Integer annexId1 = caseAttach.getAnnexId();
+                                            Long annexId1 = caseAttach.getAnnexId();
                                            sealManage1.setAnnexId(annexId1);
                                            sealManage1.setSealStatus(1);
                                            sealManage1.setIsUse(0);
@@ -90,7 +90,7 @@
        mediation_agreement,
        create_time
        )values(
-        <if test="caseLogId != null  ">#{id} ,</if>
+        <if test="caseLogId != null  ">#{caseLogId} ,</if>
        <if test="caseAppliId != null">#{caseAppliId},</if>
        <if test="caseName != null and caseName != ''">#{caseName},</if>
        <if test="caseNum != null and caseNum != ''">#{caseNum},</if>
@@ -14,7 +14,7 @@
    <name>tkgenerator</name>
    <description>tkmappergenerator</description>
    <properties>
-        <java.version>11</java.version>
+        <java.version>1.8</java.version>
    </properties>
    <dependencies>
        <dependency>
@@ -5,8 +5,8 @@ jdbc.password=YMzc157#
 #目标模块项目路径
 targetprojectpath=D:/WorkCode/zhongcai/Arbitrate-Backend/ruoyi-system
 #模块名称
-moduleName=flow
+moduleName=attach
 #表名
-tableName=gen_table
+tableName=case_attach
 #主键
-premaryId=table_id
+premaryId=annex_id