From 661092725582da2f51124a859ba8e8b66b780fdf Mon Sep 17 00:00:00 2001 From: 18792927508 <1322446236@qq.com> Date: Mon, 8 Jan 2024 10:19:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=A7=A3=E7=B3=BB=E7=BB=9Ftkmybatis?= =?UTF-8?q?=E9=80=86=E5=90=91=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/TestMapperController.java | 32 - .../controller/common/CommonController.java | 16 +- .../miniprogress/WeChatUserController.java | 1 - ...er.java => MsCaseLogRecordController.java} | 11 +- .../domain/entity/baseinfo/Country.java | 117 ---- .../system/mapper/baseinfo/CountryDAO.java | 16 - .../system/mapper/baseinfo/CountryMapper.java | 8 - .../system/service/TestMapperService.java | 25 - .../entity/casestatus/MsCaseStatus.java | 36 + .../entity/casestatus/MsCaseStatusRole.java | 28 + .../domain/entity/dept/MsSealSignRecord.java | 112 +++ .../domain/entity/mscase/MsCaseAffiliate.java | 122 ++++ .../entity/mscase/MsCaseAffiliateLog.java | 122 ++++ .../entity/mscase/MsCaseApplication.java | 199 ++++++ .../entity/mscase/MsCaseApplicationLog.java | 145 ++++ .../domain/entity/mscase/MsCaseAttach.java | 72 ++ .../domain/entity/mscase/MsCaseAttachLog.java | 72 ++ .../domain/entity/mscase/MsCaseLogRecord.java | 70 ++ .../domain/vo/mscase/MsCaseApplicationVO.java | 414 +++++++++++ ...{ColumnValue.java => MsColumnValueVO.java} | 2 +- ...nceVO.java => MsReservedConferenceVO.java} | 3 +- .../mapper/casestatus/MsCaseStatusMapper.java | 7 + .../casestatus/MsCaseStatusRoleMapper.java | 7 + .../mapper/dept/MsSealSignRecordMapper.java | 7 + .../mapper/mscase/CaseLogRecordMapper.java | 18 - .../mapper/mscase/ColumnValueLogMapper.java | 29 - .../mapper/mscase/ColumnValueMapper.java | 36 - .../mscase/MsCaseAffiliateLogMapper.java | 7 + .../mapper/mscase/MsCaseAffiliateMapper.java | 7 + .../mscase/MsCaseApplicationLogMapper.java | 7 + .../mscase/MsCaseApplicationMapper.java | 7 + ...Mapper.java => MsCaseAttachLogMapper.java} | 6 +- ...achMapper.java => MsCaseAttachMapper.java} | 6 +- .../mapper/mscase/MsCaseLogRecordMapper.java | 7 + .../mapper/mscase/MsColumnValueLogMapper.java | 29 + .../mapper/mscase/MsColumnValueMapper.java | 35 + .../dept/impl/DeptIdentifyServiceImpl.java | 655 ++++++++++++++++++ .../service/mscase/ICaseLogRecordService.java | 17 - .../mscase/MsCaseLogRecordService.java | 16 + .../service/mscase/VideoService.java | 6 +- .../mscase/impl/CaseLogRecordServiceImpl.java | 51 -- .../impl/MsCaseLogRecordServiceImpl.java | 27 + .../wisdomarbitrate/utils/CaseLogUtils.java | 25 +- .../mapper/baseinfo/CountryMapper.xml | 25 - .../casestatus/MsCaseStatusMapper.xml | 13 + .../casestatus/MsCaseStatusRoleMapper.xml | 12 + .../dept/MsSealSignRecordMapper.xml | 27 + .../mscase/CaseLogRecordMapper.xml | 66 -- .../mscase/MsCaseAffiliateLogMapper.xml | 27 + .../mscase/MsCaseAffiliateMapper.xml | 27 + .../mscase/MsCaseApplicationLogMapper.xml | 31 + .../mscase/MsCaseApplicationMapper.xml | 40 ++ ...ogMapper.xml => MsCaseAttachLogMapper.xml} | 2 +- ...ttachMapper.xml => MsCaseAttachMapper.xml} | 2 +- .../mscase/MsCaseLogRecordMapper.xml | 19 + ...gMapper.xml => MsColumnValueLogMapper.xml} | 6 +- ...alueMapper.xml => MsColumnValueMapper.xml} | 8 +- ...per.xml => MsReservedConferenceMapper.xml} | 0 58 files changed, 2447 insertions(+), 493 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/web/controller/TestMapperController.java rename ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/{CaseLogRecordController.java => MsCaseLogRecordController.java} (66%) delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/baseinfo/Country.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/baseinfo/CountryDAO.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/baseinfo/CountryMapper.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/TestMapperService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/casestatus/MsCaseStatus.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/casestatus/MsCaseStatusRole.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/dept/MsSealSignRecord.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliate.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliateLog.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplication.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplicationLog.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAttach.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAttachLog.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseLogRecord.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationVO.java rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/{ColumnValue.java => MsColumnValueVO.java} (95%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/{ReservedConferenceVO.java => MsReservedConferenceVO.java} (91%) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/casestatus/MsCaseStatusMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/casestatus/MsCaseStatusRoleMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/dept/MsSealSignRecordMapper.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseLogRecordMapper.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueLogMapper.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAffiliateLogMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAffiliateMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationLogMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationMapper.java rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/{CaseAttachLogMapper.java => MsCaseAttachLogMapper.java} (78%) rename ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/{CaseAttachMapper.java => MsCaseAttachMapper.java} (84%) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsColumnValueLogMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsColumnValueMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/impl/DeptIdentifyServiceImpl.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/ICaseLogRecordService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseLogRecordService.java delete mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/CaseLogRecordServiceImpl.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseLogRecordServiceImpl.java delete mode 100644 ruoyi-system/src/main/resources/mapper/baseinfo/CountryMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/wisdomarbitrate/casestatus/MsCaseStatusMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/wisdomarbitrate/casestatus/MsCaseStatusRoleMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/wisdomarbitrate/dept/MsSealSignRecordMapper.xml delete mode 100644 ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseLogRecordMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateLogMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationLogMapper.xml create mode 100644 ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/{CaseAttachLogMapper.xml => MsCaseAttachLogMapper.xml} (98%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/{CaseAttachMapper.xml => MsCaseAttachMapper.xml} (98%) create mode 100644 ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseLogRecordMapper.xml rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/{ColumnValueLogMapper.xml => MsColumnValueLogMapper.xml} (87%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/{ColumnValueMapper.xml => MsColumnValueMapper.xml} (83%) rename ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/{ReservedConferenceMapper.xml => MsReservedConferenceMapper.xml} (100%) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/TestMapperController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/TestMapperController.java deleted file mode 100644 index 07b9d4d..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/TestMapperController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.ruoyi.web.controller; - -import com.ruoyi.common.annotation.Anonymous; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.system.service.TestMapperService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import static com.ruoyi.common.core.domain.AjaxResult.success; - -@RestController -@RequestMapping("/testdemo") -public class TestMapperController { - @Autowired - TestMapperService testMapperService; - - @GetMapping("/queryCountry") - @Anonymous - public AjaxResult queryCountry() { - Object sealSignRecordselect = testMapperService.queryCountry(); - return success(sealSignRecordselect); - } - @GetMapping("/queryCountryById") - @Anonymous - public AjaxResult queryCountryById(@RequestParam(name = "countryid")Integer countryid) { - Object sealSignRecordselect = testMapperService.queryCountryById(countryid); - return success(sealSignRecordselect); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java index 9bd9ef5..be57b3b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java @@ -6,9 +6,9 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.wisdomarbitrate.domain.CaseApplication; +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationVO; import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach; -import com.ruoyi.wisdomarbitrate.mapper.mscase.CaseAttachMapper; +import com.ruoyi.wisdomarbitrate.mapper.mscase.MsCaseAttachMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +37,7 @@ public class CommonController @Autowired private ServerConfig serverConfig; @Autowired - private CaseAttachMapper caseAttachMapper; + private MsCaseAttachMapper msCaseAttachMapper; private static final String FILE_DELIMETER = ","; @@ -115,7 +115,7 @@ public class CommonController .userId(SecurityUtils.getUserId()) .userName(SecurityUtils.getUsername()) .build(); - caseAttachMapper.save(caseAttach); + msCaseAttachMapper.save(caseAttach); } /** * 根据案件id获取附件 @@ -129,10 +129,10 @@ public class CommonController if(caseAppliId==null){ return AjaxResult.error("案件id不能为空"); } - CaseApplication caseApplication = new CaseApplication(); - caseApplication.setId(caseAppliId); - caseApplication.setAnnexTypeList(annexTypeList); - List caseAttachList = caseAttachMapper.queryCaseAttachList(caseApplication); + MsCaseApplicationVO msCaseApplicationVO = new MsCaseApplicationVO(); + msCaseApplicationVO.setId(caseAppliId); + msCaseApplicationVO.setAnnexTypeList(annexTypeList); + List caseAttachList = msCaseAttachMapper.queryCaseAttachList(msCaseApplicationVO); return AjaxResult.success(caseAttachList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/miniprogress/WeChatUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/miniprogress/WeChatUserController.java index d964817..6c600fa 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/miniprogress/WeChatUserController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/miniprogress/WeChatUserController.java @@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil; import com.ruoyi.common.annotation.Anonymous; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.wisdomarbitrate.domain.CaseApplication; import com.ruoyi.wisdomarbitrate.domain.dto.miniprogress.IdentityAuthentication; import com.ruoyi.wisdomarbitrate.domain.vo.miniprogress.WeChatUserVO; import com.ruoyi.wisdomarbitrate.service.miniprogress.WeChatUserService; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/CaseLogRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseLogRecordController.java similarity index 66% rename from ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/CaseLogRecordController.java rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseLogRecordController.java index fffd0ee..54e2962 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/CaseLogRecordController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/wisdomarbitrate/mscase/MsCaseLogRecordController.java @@ -3,7 +3,8 @@ package com.ruoyi.web.controller.wisdomarbitrate.mscase; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; -import com.ruoyi.wisdomarbitrate.service.mscase.ICaseLogRecordService; +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord; +import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseLogRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; @@ -14,18 +15,18 @@ import java.util.List; @RestController @RequestMapping("/caseLogRecord") -public class CaseLogRecordController extends BaseController { +public class MsCaseLogRecordController extends BaseController { @Autowired - private ICaseLogRecordService caseLogRecordService; + private MsCaseLogRecordService caseLogRecordService; /** * 查询案件日志列表 */ @PreAuthorize("@ss.hasPermi('caseLog:list')") @GetMapping("/list") - public AjaxResult list(CaseLogRecord caseLogRecord) + public AjaxResult list(MsCaseLogRecord caseLogRecord) { - List list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord); + List list = caseLogRecordService.selectCaseLogRecordList(caseLogRecord); return AjaxResult.success(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/baseinfo/Country.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/baseinfo/Country.java deleted file mode 100644 index 5515e97..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/entity/baseinfo/Country.java +++ /dev/null @@ -1,117 +0,0 @@ -package com.ruoyi.system.domain.entity.baseinfo; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import javax.persistence.Column; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import java.math.BigDecimal; -import java.util.Date; - -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Data -@Table(name = "country") -public class Country { - /** - * 国家ID - */ - @Id - @Column(name = "CountryId") - @GeneratedValue(generator = "JDBC") - private Integer countryid; - - /** - * 国家名称 - */ - @Column(name = "CountryName") - private String countryname; - - /** - * 国家英文名 - */ - @Column(name = "EnglishName") - private String englishname; - - /** - * 国家缩写 - */ - @Column(name = "AbbreviationName") - private String abbreviationname; - - /** - * 国家名本地 - */ - @Column(name = "CountryNameLocal") - private String countrynamelocal; - - /** - * 国家标志路径 - */ - @Column(name = "FlagPath") - private String flagpath; - - /** - * 是否启用 1代表启用0代表不启用 - */ - @Column(name = "IsActive") - private Byte isactive; - - /** - * 经度 - */ - @Column(name = "Longitude") - private BigDecimal longitude; - - /** - * 纬度 - */ - @Column(name = "Latitude") - private BigDecimal latitude; - - /** - * 主页路径 - */ - private String url; - - /** - * 时区 - */ - @Column(name = "Timezone") - private Integer timezone; - - /** - * 创建人 - */ - @Column(name = "CreatedBy") - private Integer createdby; - - /** - * 创建时间 - */ - @Column(name = "DateCreated") - private Date datecreated; - - /** - * 更新人 - */ - @Column(name = "UpdatedBy") - private Integer updatedby; - - /** - * 更新时间 - */ - @Column(name = "DateUpdated") - private Date dateupdated; - - /** - * 国家地图Json - */ - @Column(name = "CountryJson") - private String countryjson; -} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/baseinfo/CountryDAO.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/baseinfo/CountryDAO.java deleted file mode 100644 index 7a2b3d1..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/baseinfo/CountryDAO.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.system.mapper.baseinfo; - - -import com.ruoyi.system.domain.entity.baseinfo.Country; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -public interface CountryDAO { - /** - * 查询国家 - */ - @Select("select * from country where CountryId=${CountryId}") - List selectCountryInfoById(@Param("CountryId") Integer CountryId); -} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/baseinfo/CountryMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/baseinfo/CountryMapper.java deleted file mode 100644 index 7d3a57d..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/baseinfo/CountryMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.ruoyi.system.mapper.baseinfo; - - -import com.ruoyi.system.domain.entity.baseinfo.Country; -import tk.mybatis.mapper.common.Mapper; - -public interface CountryMapper extends Mapper { -} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TestMapperService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TestMapperService.java deleted file mode 100644 index b3497db..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TestMapperService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.ruoyi.system.service; - -import com.ruoyi.system.domain.entity.baseinfo.Country; -import com.ruoyi.system.mapper.baseinfo.CountryDAO; -import com.ruoyi.system.mapper.baseinfo.CountryMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class TestMapperService { - @Autowired - CountryMapper countryMapper; - @Autowired - CountryDAO countryDAO; - public Object queryCountry() { - List countries = countryMapper.selectAll(); - return countries; - } - public Object queryCountryById(Integer countryId) { - List countries = countryDAO.selectCountryInfoById(countryId); - return countries; - } -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/casestatus/MsCaseStatus.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/casestatus/MsCaseStatus.java new file mode 100644 index 0000000..0fe9d7c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/casestatus/MsCaseStatus.java @@ -0,0 +1,36 @@ +package com.ruoyi.wisdomarbitrate.domain.entity.casestatus; + +import javax.persistence.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@Table(name = "ms_case_status") +public class MsCaseStatus { + /** + * id + */ + @Id + @GeneratedValue(generator = "JDBC") + private Integer id; + + /** + * 案件状态 + */ + @Column(name = "case_status") + private Integer caseStatus; + + /** + * 案件状态名称 + */ + @Column(name = "case_status_name") + private String caseStatusName; + + /** + * 顺序 + */ + private Integer sort; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/casestatus/MsCaseStatusRole.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/casestatus/MsCaseStatusRole.java new file mode 100644 index 0000000..0f9a5a1 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/casestatus/MsCaseStatusRole.java @@ -0,0 +1,28 @@ +package com.ruoyi.wisdomarbitrate.domain.entity.casestatus; + +import javax.persistence.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@Table(name = "ms_case_status_role") +public class MsCaseStatusRole { + @Id + @GeneratedValue(generator = "JDBC") + private Integer id; + + /** + * 案件状态表id，关联案件状态表 + */ + @Column(name = "case_status_id") + private Integer caseStatusId; + + /** + * 角色id，关联角色表 + */ + @Column(name = "role_id") + private Integer roleId; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/dept/MsSealSignRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/dept/MsSealSignRecord.java new file mode 100644 index 0000000..b4285c2 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/dept/MsSealSignRecord.java @@ -0,0 +1,112 @@ +package com.ruoyi.wisdomarbitrate.domain.entity.dept; + +import javax.persistence.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@Table(name = "ms_seal_sign_record") +public class MsSealSignRecord { + @Id + @GeneratedValue(generator = "JDBC") + private Long id; + + /** + * 文件id + */ + @Column(name = "file_id") + private String fileId; + + /** + * 文件名称 + */ + @Column(name = "file_name") + private String fileName; + + /** + * 流程id + */ + @Column(name = "sign_flow_id") + private String signFlowId; + + /** + * 签名人账户 + */ + @Column(name = "penson_account") + private String pensonAccount; + + /** + * 签名人姓名 + */ + @Column(name = "penson_name") + private String pensonName; + + /** + * 机构名称 + */ + @Column(name = "orgnize_name") + private String orgnizeName; + + /** + * 机构经办人 + */ + @Column(name = "orgn_name_psn_acc") + private String orgnNamePsnAcc; + + /** + * 机构经办人名称 + */ + @Column(name = "orgn_name_psn_name") + private String orgnNamePsnName; + + /** + * 流程状态 + */ + @Column(name = "sign_flow_status") + private Integer signFlowStatus; + + @Column(name = "case_appli_id") + private Long caseAppliId; + + /** + * 签名位置页数 + */ + @Column(name = "position_pagepsn") + private String positionPagepsn; + + /** + * 签名位置x坐标 + */ + @Column(name = "position_xpsn") + private Double positionXpsn; + + /** + * 签名位置y坐标 + */ + @Column(name = "position_ypsn") + private Double positionYpsn; + + /** + * 印章位置页数 + */ + @Column(name = "position_pageorg") + private String positionPageorg; + + /** + * 印章位置x坐标 + */ + @Column(name = "position_xorg") + private Double positionXorg; + + /** + * 印章位置y坐标 + */ + @Column(name = "position_yorg") + private Double positionYorg; + + @Column(name = "file_download_url") + private String fileDownloadUrl; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliate.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliate.java new file mode 100644 index 0000000..bc40108 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliate.java @@ -0,0 +1,122 @@ +package com.ruoyi.wisdomarbitrate.domain.entity.mscase; + +import java.util.Date; +import javax.persistence.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@Table(name = "ms_case_affiliate") +public class MsCaseAffiliate { + /** + * 案件主表id，案件申请表主键 + */ + @Id + @Column(name = "case_appli_id") + private Long caseAppliId; + + /** + * 申请机构 + */ + @Column(name = "application_organ_id") + private String applicationOrganId; + + /** + * 申请机构名称 + */ + @Column(name = "application_organ_name") + private String applicationOrganName; + + /** + * 统一社会信用代码 + */ + @Column(name = "credit_code") + private String creditCode; + + /** + * 法定代表人 + */ + @Column(name = "comp_legal_person") + private String compLegalPerson; + + /** + * 申请人住所 + */ + @Column(name = "applicant_home") + private String applicantHome; + + /** + * 申请人联系地址 + */ + @Column(name = "applicant_address") + private String applicantAddress; + + /** + * 委托代理人姓名 + */ + @Column(name = "name_agent") + private String nameAgent; + + /** + * 代理人联系电话 + */ + @Column(name = "contact_telphone_agent") + private String contactTelphoneAgent; + + /** + * 代理人邮箱 + */ + @Column(name = "agent_email") + private String agentEmail; + + /** + * 申请人快递单号 + */ + @Column(name = "applicant_track_num") + private String applicantTrackNum; + + /** + * 被申请人姓名 + */ + @Column(name = "respondent_name") + private String respondentName; + + /** + * 被申请人身份证号 + */ + @Column(name = "respondent_identity_num") + private String respondentIdentityNum; + + /** + * 被申请人性别(0=男,女=1) + */ + @Column(name = "respondent_sex") + private String respondentSex; + + /** + * 被申请人出生年月日 + */ + @Column(name = "respondent_birth") + private Date respondentBirth; + + /** + * 被申请人申请人住所 + */ + @Column(name = "respondent_home") + private String respondentHome; + + /** + * 被申请人邮箱 + */ + @Column(name = "respondent_email") + private String respondentEmail; + + /** + * 被申请人快递单号 + */ + @Column(name = "respondent_track_num") + private String respondentTrackNum; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliateLog.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliateLog.java new file mode 100644 index 0000000..e4d95da --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAffiliateLog.java @@ -0,0 +1,122 @@ +package com.ruoyi.wisdomarbitrate.domain.entity.mscase; + +import java.util.Date; +import javax.persistence.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@Table(name = "ms_case_affiliate_log") +public class MsCaseAffiliateLog { + /** + * 案件日志表表id，案件申请表主键 + */ + @Id + @Column(name = "case_appli_log_id") + private Long caseAppliLogId; + + /** + * 申请机构 + */ + @Column(name = "application_organ_id") + private String applicationOrganId; + + /** + * 申请机构名称 + */ + @Column(name = "application_organ_name") + private String applicationOrganName; + + /** + * 统一社会信用代码 + */ + @Column(name = "credit_code") + private String creditCode; + + /** + * 法定代表人 + */ + @Column(name = "comp_legal_person") + private String compLegalPerson; + + /** + * 申请人住所 + */ + @Column(name = "applicant_home") + private String applicantHome; + + /** + * 申请人联系地址 + */ + @Column(name = "applicant_address") + private String applicantAddress; + + /** + * 委托代理人姓名 + */ + @Column(name = "name_agent") + private String nameAgent; + + /** + * 代理人联系电话 + */ + @Column(name = "contact_telphone_agent") + private String contactTelphoneAgent; + + /** + * 代理人邮箱 + */ + @Column(name = "agent_email") + private String agentEmail; + + /** + * 申请人快递单号 + */ + @Column(name = "applicant_track_num") + private String applicantTrackNum; + + /** + * 被申请人姓名 + */ + @Column(name = "respondent_name") + private String respondentName; + + /** + * 被申请人身份证号 + */ + @Column(name = "respondent_identity_num") + private String respondentIdentityNum; + + /** + * 被申请人性别(0=男,女=1) + */ + @Column(name = "respondent_sex") + private String respondentSex; + + /** + * 被申请人出生年月日 + */ + @Column(name = "respondent_birth") + private Date respondentBirth; + + /** + * 被申请人申请人住所 + */ + @Column(name = "respondent_home") + private String respondentHome; + + /** + * 被申请人邮箱 + */ + @Column(name = "respondent_email") + private String respondentEmail; + + /** + * 被申请人快递单号 + */ + @Column(name = "respondent_track_num") + private String respondentTrackNum; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplication.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplication.java new file mode 100644 index 0000000..6e75ca9 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplication.java @@ -0,0 +1,199 @@ +package com.ruoyi.wisdomarbitrate.domain.entity.mscase; + +import java.math.BigDecimal; +import java.util.Date; +import javax.persistence.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@Table(name = "ms_case_application") +public class MsCaseApplication { + /** + * id + */ + @Id + @GeneratedValue(generator = "JDBC") + private Long id; + + /** + * 批次 + */ + @Column(name = "batch_number") + private Integer batchNumber; + + /** + * 模板id + */ + @Column(name = "template_id") + private Long templateId; + + /** + * 案件编号 + */ + @Column(name = "case_num") + private String caseNum; + + /** + * 案件标的(欠款总金额) + */ + @Column(name = "case_subject_amount") + private BigDecimal caseSubjectAmount; + + /** + * 调解方式,1-开庭调解，2-书面调解 + */ + @Column(name = "mediation_method") + private String mediationMethod; + + /** + * 案件状态,字典 + */ + @Column(name = "case_status") + private Integer caseStatus; + + /** + * 开庭日期 + */ + @Column(name = "hear_date") + private Date hearDate; + + /** + * 调解应缴费用 + */ + @Column(name = "fee_payable") + private BigDecimal feePayable; + + /** + * 调解员id + */ + @Column(name = "mediator_id") + private Long mediatorId; + + /** + * 调解员名称 + */ + @Column(name = "mediator_name") + private String mediatorName; + + /** + * 是否同意组庭,0否，1是 + */ + @Column(name = "is_agree_pend_tral") + private Integer isAgreePendTral; + + /** + * 支付方式（0线上支付，1线下支付） + */ + @Column(name = "pay_type") + private String payType; + + /** + * 是否仲裁反请求,1是，0否 + */ + @Column(name = "adjudica_counter") + private Integer adjudicaCounter; + + /** + * 被申请人是否缺席,1是，0否 + */ + @Column(name = "is_absence") + private Integer isAbsence; + + /** + * 是否锁定，0-否，1-是 + */ + @Column(name = "lock_status") + private Integer lockStatus; + + /** + * 视频会议房间号id + */ + @Column(name = "room_id") + private String roomId; + + /** + * 申请人是否书面审理,1是，0否 + */ + @Column(name = "appli_iswrit_hear") + private Integer appliIswritHear; + + /** + * 被申请人是否书面审理，1是，0否 + */ + @Column(name = "respon_isWrit_hear") + private Integer responIswritHear; + + /** + * 创建者 + */ + @Column(name = "create_by") + private String createBy; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新者 + */ + @Column(name = "update_by") + private String updateBy; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 + */ + private Integer version; + + /** + * 申请人仲裁请求 + */ + @Column(name = "arbitrat_claims") + private String arbitratClaims; + + /** + * 事实和理由 + */ + private String facts; + + /** + * 申请人请求仲裁庭裁决 + */ + @Column(name = "request_rule") + private String requestRule; + + /** + * 案件描述 + */ + @Column(name = "case_describe") + private String caseDescribe; + + /** + * 调解书URL + */ + @Column(name = "mediation_url") + private String mediationUrl; + + /** + * 仲裁反请求原因 + */ + @Column(name = "adjudica_counter_reason") + private String adjudicaCounterReason; + + /** + * 调解内容 + */ + @Column(name = "mediation_agreement") + private String mediationAgreement; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplicationLog.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplicationLog.java new file mode 100644 index 0000000..d5cf79a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseApplicationLog.java @@ -0,0 +1,145 @@ +package com.ruoyi.wisdomarbitrate.domain.entity.mscase; + +import java.math.BigDecimal; +import java.util.Date; +import javax.persistence.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@Table(name = "ms_case_application_log") +public class MsCaseApplicationLog { + /** + * id + */ + @Id + @GeneratedValue(generator = "JDBC") + private Long id; + + /** + * 案件id，关联案件申请表 + */ + @Column(name = "case_appli_id") + private Long caseAppliId; + + /** + * 批次 + */ + @Column(name = "batch_number") + private Integer batchNumber; + + /** + * 模板id + */ + @Column(name = "template_id") + private Long templateId; + + /** + * 案件编号 + */ + @Column(name = "case_num") + private String caseNum; + + /** + * 案件标的(欠款总金额) + */ + @Column(name = "case_subject_amount") + private BigDecimal caseSubjectAmount; + + /** + * 调解方式,枚举,1-开庭调解，2-书面调解 + */ + @Column(name = "mediation_method") + private Integer mediationMethod; + + /** + * 案件状态,字典 + */ + @Column(name = "case_status") + private Integer caseStatus; + + /** + * 调解应缴费用 + */ + @Column(name = "fee_payable") + private BigDecimal feePayable; + + /** + * 是否锁定，0-否，1-是 + */ + @Column(name = "lock_status") + private Integer lockStatus; + + /** + * 申请人是否书面审理,1是，0否 + */ + @Column(name = "appli_iswrit_hear") + private Integer appliIswritHear; + + /** + * 被申请人是否书面审理，1是，0否 + */ + @Column(name = "respon_isWrit_hear") + private Integer responIswritHear; + + /** + * 创建者 + */ + @Column(name = "create_by") + private String createBy; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新者 + */ + @Column(name = "update_by") + private String updateBy; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 版本号 + */ + private Integer version; + + /** + * 申请人仲裁请求 + */ + @Column(name = "arbitrat_claims") + private String arbitratClaims; + + /** + * 事实和理由 + */ + private String facts; + + /** + * 申请人请求仲裁庭裁决 + */ + @Column(name = "request_rule") + private String requestRule; + + /** + * 案件描述 + */ + @Column(name = "case_describe") + private String caseDescribe; + + /** + * 调解内容 + */ + @Column(name = "mediation_agreement") + private String mediationAgreement; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAttach.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAttach.java new file mode 100644 index 0000000..d5a2eaf --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAttach.java @@ -0,0 +1,72 @@ +package com.ruoyi.wisdomarbitrate.domain.entity.mscase; + +import javax.persistence.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@Table(name = "ms_case_attach") +public class MsCaseAttach { + /** + * 附件id + */ + @Id + @Column(name = "annex_id") + private Long annexId; + + /** + * 案件申请id + */ + @Column(name = "case_appli_id") + private Long caseAppliId; + + /** + * 附件名称 + */ + @Column(name = "annex_name") + private String annexName; + + /** + * 附件路径 + */ + @Column(name = "annex_path") + private String annexPath; + + /** + * 附件类型,立案申请书(1)、申请人证据材料(2)、仲裁文书(3)、案件视频(4)、身份证件(5)、被申请人证据材料 (6)、庭审笔录(7)、缴费凭证(8)、视频录制(9)、公章图片(10)、语音转录文件(11) + */ + @Column(name = "annex_type") + private Integer annexType; + + /** + * 备注 + */ + private String note; + + /** + * 用户id + */ + @Column(name = "use_id") + private Long useId; + + /** + * 用户账户 + */ + @Column(name = "use_account") + private String useAccount; + + /** + * 印章状态(0未启用,1已启用) + */ + @Column(name = "seal_status") + private Long sealStatus; + + /** + * 是否是证据上传，0-否，1-是 + */ + @Column(name = "is_batch_upload") + private Long isBatchUpload; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAttachLog.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAttachLog.java new file mode 100644 index 0000000..7f55f3a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseAttachLog.java @@ -0,0 +1,72 @@ +package com.ruoyi.wisdomarbitrate.domain.entity.mscase; + +import javax.persistence.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@Table(name = "ms_case_attach_log") +public class MsCaseAttachLog { + /** + * id + */ + @Id + @GeneratedValue(generator = "JDBC") + private Long id; + + /** + * 案件申请id + */ + @Column(name = "case_appli_log_id") + private Long caseAppliLogId; + + /** + * 附件id + */ + @Column(name = "annex_id") + private Long annexId; + + /** + * 附件名称 + */ + @Column(name = "annex_name") + private String annexName; + + /** + * 附件路径 + */ + @Column(name = "annex_path") + private String annexPath; + + /** + * 附件类型,立案申请书(1)、申请人证据材料(2)、仲裁文书(3)、案件视频(4)、身份证件(5)、被申请人证据材料 (6)、庭审笔录(7)、缴费凭证(8)、视频录制(9)、公章图片(10) + */ + @Column(name = "annex_type") + private Integer annexType; + + /** + * 备注 + */ + private String note; + + /** + * 用户id + */ + @Column(name = "use_id") + private Long useId; + + /** + * 用户账户 + */ + @Column(name = "use_account") + private String useAccount; + + /** + * 印章状态(0未启用,1已启用) + */ + @Column(name = "seal_status") + private Long sealStatus; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseLogRecord.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseLogRecord.java new file mode 100644 index 0000000..155bd0d --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/entity/mscase/MsCaseLogRecord.java @@ -0,0 +1,70 @@ +package com.ruoyi.wisdomarbitrate.domain.entity.mscase; + +import java.util.Date; +import javax.persistence.*; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString +@Table(name = "ms_case_log_record") +public class MsCaseLogRecord { + @Id + @GeneratedValue(generator = "JDBC") + private Long id; + + /** + * 案件申请id + */ + @Column(name = "case_appli_id") + private Long caseAppliId; + + /** + * 案件节点 + */ + @Column(name = "case_node") + private Integer caseNode; + + /** + * 案件节点时间 + */ + @Column(name = "case_node_time") + private Date caseNodeTime; + + /** + * 操作人用户名 + */ + @Column(name = "create_by") + private String createBy; + + /** + * 操作人用户昵称 + */ + @Column(name = "create_nick_name") + private String createNickName; + + /** + * 创建时间 + */ + @Column(name = "create_time") + private Date createTime; + + /** + * 更新者 + */ + @Column(name = "update_by") + private String updateBy; + + /** + * 更新时间 + */ + @Column(name = "update_time") + private Date updateTime; + + /** + * 备注 + */ + private String notes; +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationVO.java new file mode 100644 index 0000000..b020ef7 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsCaseApplicationVO.java @@ -0,0 +1,414 @@ +package com.ruoyi.wisdomarbitrate.domain.vo.mscase; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +@Data +public class MsCaseApplicationVO extends BaseEntity { + private static final long serialVersionUID = 1L; + /** + * 查询案件时区分是否待办案件，0待办案件，1已办案件 + */ + private String selectCaseStatus; + + /** ID */ + private Long id; + /** 案件名称 */ + @Excel(name = "案件名称") + private String caseName; + /** 案件编号 */ +// @Excel(name = "案件编号") + private String caseNum; + /** 案件标的 */ + @Excel(name = "案件标的") + private BigDecimal caseSubjectAmount; + /** + * 模板id + */ + private Long templateId; + + + + /** 立案日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date registerDate; + /** 仲裁方式 */ + private Integer arbitratMethod; + /** + * 是否导入，0手动录入，1导入，默认0 + */ + private Integer importFlag; + /** 仲裁方式名称 */ + private String arbitratMethodName; + + /** 案件状态 */ + private Integer caseStatus; + + /** 申请人是否书面审理 */ + private Integer applicantIsWrittenHear; + + /** 被申请人是否书面审理 */ + private Integer respondentIsWrittenHear; + /** 开庭方式是否一致 */ + private Integer arbitraMethodIssame; + /** 仲裁方式说明 */ + private String arbitratMethodIllustrate; + + + /** 案件申请表ID */ + private Long caseAppliId; + + /** 开庭日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date hearDate; + + /** 借款开始日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "借款开始日期") + private Date loanStartDate; + /** 借款结束日期 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "借款结束日期") + private Date loanEndDate; + /** 合同编号 */ + @Excel(name = "合同编号") + private String contractNumber; + /** 申请人主张欠本金 */ + @Excel(name = "申请人主张欠本金") + private BigDecimal claimPrinciOwed; + /** 申请人主张欠利息 */ + @Excel(name = "申请人主张欠利息") + private BigDecimal claimInterestOwed; + /** 申请人主张违约金 */ + @Excel(name = "申请人主张违约金") + private BigDecimal claimLiquidDamag; + /** 申请人请求仲裁庭裁决 */ + @Excel(name = "申请人请求仲裁庭裁决",width = 36) + private String requestRule; + + /** 是否财产保全申请 */ + @Excel(name = "是否财产保全申请",width = 26,combo= {"是","否"},readConverterExp = "0=否,1=是") + private Integer properPreser; + /** 申请人仲裁请求及事实和理由 */ + @Excel(name = "申请人仲裁请求及事实和理由",width = 36) + private String arbitratClaims; + /** 仲裁应缴费用 */ + private BigDecimal feePayable; + + /** 开始在线视频时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date beginVideoDate; + /** 在线视频人员 */ + private String onlineVideoPerson; + + /** 仲裁员id */ + private String arbitratorId; + /** 仲裁员名称 */ + private String arbitratorName; + + /** 案件描述 */ + private String caseDescribe; + /** 裁决书URL */ + private String filearbitraUrl; + + /** 是否同意组庭 */ + private Integer isAgreePendTral; + + /** 是否有异议需要举证 */ + private Integer objectionAddEviden; + /** 是否需要开庭审理 */ + private Integer openCourtHear; + + /** 是否仲裁反请求 */ + private Integer adjudicaCounter; + /** + * 仲裁反请求原因 + */ + private String adjudicaCounterReason; + + /** 被申请人是否缺席 */ + private Integer isAbsence; + /** 是否管辖异议申请 */ + private Integer objectiJuris; + /** 被申请人质证意见 */ + private String responCrossOpin; + /** 被申请人的答辩意见 */ + private String responDefenOpini; + /** 申请人是否缺席 */ + private Integer appliIsAbsen; + + /** 申请人质证意见 */ + private String applicaCrossOpin; + + /** 支付状态 */ + private Integer paymentStatus; + + /** 支付状态描述 */ + private String paymentStatusName; + /** + * 支付方式code，0线上支付，1线下支付 + */ + private Integer payTypeCode; + /** + * 支付方式name，0线上支付，1线下支付 + */ + private String payTypeName; + + + /** + * 缴费凭证 + */ + private List payOrderList; + // 导入校验失败信息 + private StringBuilder errorMsg; + /** + * 是否锁定，0-否，1-是 + */ + private Integer lockStatus; + /** 案件状态名称 */ + private String caseStatusName; + /** 是否同意审核 */ + private Integer agreeOrNotCheck; + /** 申请人名称 */ + private String applicantName; + /** 被申请人名称 */ + private String respondentName; + /** + * 用户身份证号 + */ + private String idCard; + /** + * 用户id + */ + private String userId; + /** + * 登录用户用户名 + */ + private String loginUserName; + private List deptIds; + /** + * 部门长状态 + */ + private List deptHeadStatus; + /** + * 代理人角色有关部门 + */ + private List agentDeptIds; + /** + * 财务状态 + */ + private Integer financeStatus; + /** + * 是否是被申请人，仲裁员,部门长，财务，代理人，0-否，1-是 + */ + private Integer isOtherRole; + /** + * 案件日志id + */ + private Long caseLogId; + /** 仲裁结果 */ + private String caseResult; + /** 是否指派仲裁员 */ + private int pendingAppointArbotrar; + + + private List caseStatusList; + + private List annexTypeList; + + private Integer annexType; + /** + * 案件附件列表 + */ + private List caseAttachList; + + /** 身份类型 */ +// @Excel(name = "身份类型") + private int identityType; + /** + * 申请人主体信息 + */ + /** 姓名 */ + @Excel(name = "申请人主体信息-申请人(机构)",width = 26) + private String name; + /** 身份证号 */ + @Excel(name = "申请人主体信息-代码",width = 26) + private String identityNum; + /** 申请人主体信息-法定代表人 */ + @Excel(name = "申请人主体信息-法定代表人",width = 26) + private String compLegalPerson; + /** 申请人主体信息-法定代表人 */ + @Excel(name = "申请人主体信息-法定代表人职位",width = 26) + private String compLegalperPost; + /** + * 申请人主体信息-申请人(机构)id + */ + private String nameId; + + /** 联系电话 */ + @Excel(name = "申请人主体信息-联系电话",width = 26) + private String contactTelphone; + /** 联系地址 */ + @Excel(name = "申请人主体信息-联系地址",width = 26) + private String contactAddress; + /** 单位电话 */ + @Excel(name = "申请人主体信息-单位电话",width = 26) + private String workTelphone; + /** 单位地址 */ + @Excel(name = "申请人主体信息-单位地址",width = 26) + private String workAddress; + + /** 申请人住所 */ + @Excel(name = "申请人主体信息-住所",width = 26) + private String residenAffiliAppli; + + /** 申请人邮箱 */ + @Excel(name = "申请人主体信息-邮箱",width = 26) + private String email; + /** 代理人姓名 */ + @Excel(name = "申请人主体信息-代理人姓名",width = 26) + private String nameAgent; + /** 身份证号 */ + @Excel(name = "申请人主体信息-代理人身份证号",width = 26) + private String identityNumAgent; + + /** 联系电话 */ + @Excel(name = "申请人主体信息-代理人联系电话",width = 26) + private String contactTelphoneAgent; + /** 联系地址 */ + @Excel(name = "申请人主体信息-代理人联系地址",width = 26) + private String contactAddressAgent; + /** 申请人代理人职称 */ + @Excel(name = "申请人主体信息-代理人职称",width = 26) + private String appliAgentTitle; + /** + * 被申请人主体信息 + */ + /** 姓名 */ + @Excel(name = "被申请人主体信息-申请人姓名",width = 26) + private String debtorName; + /** 身份证号 */ + @Excel(name = "被申请人主体信息-身份证号",width = 26) + private String debtorIdentityNum; + /** 被申请人主体信息-性别 */ + @Excel(name = "被申请人主体信息-性别",width = 26,combo= {"男","女"},readConverterExp = "0=男,1=女") + private String responSex; + /** 被申请人主体信息-出生年月日 */ + @Excel(name = "被申请人主体信息-出生年月日",width = 26) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date responBirth; + /** 联系电话 */ + @Excel(name = "被申请人主体信息-联系电话",width = 26) + private String debtorContactTelphone; + /** 联系地址 */ + @Excel(name = "被申请人主体信息-联系地址",width = 26) + private String debtorContactAddress; + /** 被申请人住所 */ + @Excel(name = "被申请人主体信息-住所",width = 26) + private String residenAffiliRespon; + /** 单位电话 */ + @Excel(name = "被申请人主体信息-单位电话",width = 26) + private String debtorWorkTelphone; + /** 单位地址 */ + @Excel(name = "被申请人主体信息-单位地址",width = 26) + private String debtorWorkAddress; + /** 邮箱 */ + @Excel(name = "被申请人主体信息-邮箱",width = 26) + private String debtorEmail; + + /** 代理人姓名 */ + @Excel(name = "被申请人主体信息-代理人姓名",width = 26) + private String debtorNameAgent; + /** 身份证号 */ + @Excel(name = "被申请人主体信息-代理人身份证号",width = 26) + private String debtorIdentityNumAgent; + /** 联系电话 */ + @Excel(name = "被申请人主体信息-代理人联系电话",width = 26) + private String debtorContactTelphoneAgent; + /** 联系地址 */ + @Excel(name = "被申请人主体信息-代理人联系地址",width = 26) + private String debtorContactAddressAgent; + /** + * 申请机构id + */ + private String applicationOrganId; + /** + * 版本号 + */ + private Integer version; + /** + * 修改案件的提交状态，0-未提交，1-已提交，2-同意，3-拒绝，4-撤销 + */ + private Integer updateSubmitStatus; + /** 合同名称 */ + private String contractName; + /** + * 事实和理由 + */ + private String facts; + /** + * 合同甲方 + */ + private String partyA; + /** + * 利率 + */ + private String interestRate; + /** + * 待还金额 + */ + private String outstandingMoney; + /** + * 调解达成协议内容 + */ + private String mediationAgreement; + /** + * 金融消费纠纷基本情况 + */ + private String disputes; + /** + * 贷款类型 + */ + private String loanType; + /** + * 贷款期限 + */ + private String loanTerm; + /** + * 本案争议焦点 + */ + private String caseFocus; + /** + * 本案事实 + */ + private String caseFacts; + /** + * 被申请人对上述材料的质证意见 + */ + private String respondentOpinion; + /** + * 申请人对上述材料的质证意见 + */ + private String applicantOpinion; + /** + * 批号 + */ + private Integer batchNumber; + /** + * 自定义字段 + */ + private List msColumnValueVOS; + /** + * 待办状态，0待办，1已办 + */ + private Integer pendingStatus; + /** e签宝流程id */ + private String signFlowId;; +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ColumnValue.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsColumnValueVO.java similarity index 95% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ColumnValue.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsColumnValueVO.java index 0911c45..f37d23a 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ColumnValue.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsColumnValueVO.java @@ -6,7 +6,7 @@ import lombok.Data; * 动态配置字段表 */ @Data -public class ColumnValue { +public class MsColumnValueVO { private static final long serialVersionUID = 1L; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ReservedConferenceVO.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsReservedConferenceVO.java similarity index 91% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ReservedConferenceVO.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsReservedConferenceVO.java index 8a42fde..e7551d4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/ReservedConferenceVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/domain/vo/mscase/MsReservedConferenceVO.java @@ -3,7 +3,6 @@ package com.ruoyi.wisdomarbitrate.domain.vo.mscase; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.Date; @@ -13,7 +12,7 @@ import java.util.Date; * @date 2023-11-08 11:05 */ @Data -public class ReservedConferenceVO { +public class MsReservedConferenceVO { /** * 用户id */ diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/casestatus/MsCaseStatusMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/casestatus/MsCaseStatusMapper.java new file mode 100644 index 0000000..142a457 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/casestatus/MsCaseStatusMapper.java @@ -0,0 +1,7 @@ +package com.ruoyi.wisdomarbitrate.mapper.casestatus; + +import com.ruoyi.wisdomarbitrate.domain.entity.casestatus.MsCaseStatus; +import tk.mybatis.mapper.common.Mapper; + +public interface MsCaseStatusMapper extends Mapper { +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/casestatus/MsCaseStatusRoleMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/casestatus/MsCaseStatusRoleMapper.java new file mode 100644 index 0000000..3665374 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/casestatus/MsCaseStatusRoleMapper.java @@ -0,0 +1,7 @@ +package com.ruoyi.wisdomarbitrate.mapper.casestatus; + +import com.ruoyi.wisdomarbitrate.domain.entity.casestatus.MsCaseStatusRole; +import tk.mybatis.mapper.common.Mapper; + +public interface MsCaseStatusRoleMapper extends Mapper { +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/dept/MsSealSignRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/dept/MsSealSignRecordMapper.java new file mode 100644 index 0000000..43cd424 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/dept/MsSealSignRecordMapper.java @@ -0,0 +1,7 @@ +package com.ruoyi.wisdomarbitrate.mapper.dept; + +import com.ruoyi.wisdomarbitrate.domain.entity.dept.MsSealSignRecord; +import tk.mybatis.mapper.common.Mapper; + +public interface MsSealSignRecordMapper extends Mapper { +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseLogRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseLogRecordMapper.java deleted file mode 100644 index 0817fa8..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseLogRecordMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.ruoyi.wisdomarbitrate.mapper.mscase; - -import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; -import com.ruoyi.wisdomarbitrate.domain.dto.mscase.MsCaseLogRecordDTO; -import org.apache.ibatis.annotations.Param; -import tk.mybatis.mapper.common.Mapper; - -import java.util.List; - -public interface CaseLogRecordMapper extends Mapper { - - - List selectCaseLogRecordList(CaseLogRecord caseLogRecord); - - int insertCaseLogRecord(CaseLogRecord caseLogRecord); - - void batchInsertRecord(@Param("list")List list); -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueLogMapper.java deleted file mode 100644 index 33cf3d3..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueLogMapper.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.ruoyi.wisdomarbitrate.mapper.mscase; - -import com.ruoyi.wisdomarbitrate.domain.vo.mscase.ColumnValue; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * 动态配置字段表 - */ -@Repository -public interface ColumnValueLogMapper { - - /** - * 批量新增 - */ - int batchSave(@Param("list") List list); - void batchUpdate(@Param("list") List list); - - /** - * 根据案件id查询字段及值 - * @param caseAppliLogId - * @return - */ - List listBycaseAppliLogId(@Param("caseAppliLogId") Long caseAppliLogId); - - List queryColumnValueList(ColumnValue columnValue); -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueMapper.java deleted file mode 100644 index fe63ee0..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/ColumnValueMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.ruoyi.wisdomarbitrate.mapper.mscase; - -import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import com.ruoyi.wisdomarbitrate.domain.vo.mscase.ColumnValue; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * 动态配置字段表 - */ -@Repository -public interface ColumnValueMapper { - - /** - * 批量新增 - */ - int batchSave(@Param("list") List list); - - /** - * 根据案件id查询字段及值 - * @param caseId - * @return - */ - List listByCaseId(@Param("caseId") Long caseId); - - List queryColumnValueList(ColumnValue columnValue); - /** - * 批量修改 - */ - void batchUpdate(@Param("list") List list); - - int updateColumnValue(ColumnValue columnValue); - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAffiliateLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAffiliateLogMapper.java new file mode 100644 index 0000000..71de607 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAffiliateLogMapper.java @@ -0,0 +1,7 @@ +package com.ruoyi.wisdomarbitrate.mapper.mscase; + +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliateLog; +import tk.mybatis.mapper.common.Mapper; + +public interface MsCaseAffiliateLogMapper extends Mapper { +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAffiliateMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAffiliateMapper.java new file mode 100644 index 0000000..c05d979 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAffiliateMapper.java @@ -0,0 +1,7 @@ +package com.ruoyi.wisdomarbitrate.mapper.mscase; + +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseAffiliate; +import tk.mybatis.mapper.common.Mapper; + +public interface MsCaseAffiliateMapper extends Mapper { +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationLogMapper.java new file mode 100644 index 0000000..a6fa818 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationLogMapper.java @@ -0,0 +1,7 @@ +package com.ruoyi.wisdomarbitrate.mapper.mscase; + +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplicationLog; +import tk.mybatis.mapper.common.Mapper; + +public interface MsCaseApplicationLogMapper extends Mapper { +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationMapper.java new file mode 100644 index 0000000..0332e57 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseApplicationMapper.java @@ -0,0 +1,7 @@ +package com.ruoyi.wisdomarbitrate.mapper.mscase; + +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseApplication; +import tk.mybatis.mapper.common.Mapper; + +public interface MsCaseApplicationMapper extends Mapper { +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAttachLogMapper.java similarity index 78% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachLogMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAttachLogMapper.java index a6470f6..10a99a8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachLogMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAttachLogMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.wisdomarbitrate.mapper.mscase; -import com.ruoyi.wisdomarbitrate.domain.CaseApplication; +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationVO; import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -8,12 +8,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface CaseAttachLogMapper { +public interface MsCaseAttachLogMapper { int save(CaseAttach caseAttach); List queryAnnexPathByCaseId(Long id); - List queryCaseAttachList(CaseApplication caseApplication); + List queryCaseAttachList(MsCaseApplicationVO msCaseApplicationVO); int updateCaseAttach(CaseAttach caseAttach); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAttachMapper.java similarity index 84% rename from ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachMapper.java rename to ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAttachMapper.java index bd7d877..412b388 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/CaseAttachMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseAttachMapper.java @@ -1,6 +1,6 @@ package com.ruoyi.wisdomarbitrate.mapper.mscase; -import com.ruoyi.wisdomarbitrate.domain.CaseApplication; +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsCaseApplicationVO; import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -8,13 +8,13 @@ import org.apache.ibatis.annotations.Param; import java.util.List; @Mapper -public interface CaseAttachMapper { +public interface MsCaseAttachMapper { int save(CaseAttach caseAttach); int batchSave(@Param("list") List caseAttach); List queryAnnexPathByCaseId(Long id); - List queryCaseAttachList(CaseApplication caseApplication); + List queryCaseAttachList(MsCaseApplicationVO msCaseApplicationVO); int updateCaseAttach(CaseAttach caseAttach); diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java new file mode 100644 index 0000000..5c86881 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsCaseLogRecordMapper.java @@ -0,0 +1,7 @@ +package com.ruoyi.wisdomarbitrate.mapper.mscase; + +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord; +import tk.mybatis.mapper.common.Mapper; + +public interface MsCaseLogRecordMapper extends Mapper { +} \ No newline at end of file diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsColumnValueLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsColumnValueLogMapper.java new file mode 100644 index 0000000..c516f17 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsColumnValueLogMapper.java @@ -0,0 +1,29 @@ +package com.ruoyi.wisdomarbitrate.mapper.mscase; + +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsColumnValueVO; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 动态配置字段表 + */ +@Repository +public interface MsColumnValueLogMapper { + + /** + * 批量新增 + */ + int batchSave(@Param("list") List list); + void batchUpdate(@Param("list") List list); + + /** + * 根据案件id查询字段及值 + * @param caseAppliLogId + * @return + */ + List listBycaseAppliLogId(@Param("caseAppliLogId") Long caseAppliLogId); + + List queryColumnValueList(MsColumnValueVO msColumnValueVO); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsColumnValueMapper.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsColumnValueMapper.java new file mode 100644 index 0000000..c393349 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/mapper/mscase/MsColumnValueMapper.java @@ -0,0 +1,35 @@ +package com.ruoyi.wisdomarbitrate.mapper.mscase; + +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsColumnValueVO; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 动态配置字段表 + */ +@Repository +public interface MsColumnValueMapper { + + /** + * 批量新增 + */ + int batchSave(@Param("list") List list); + + /** + * 根据案件id查询字段及值 + * @param caseId + * @return + */ + List listByCaseId(@Param("caseId") Long caseId); + + List queryColumnValueList(MsColumnValueVO msColumnValueVO); + /** + * 批量修改 + */ + void batchUpdate(@Param("list") List list); + + int updateColumnValue(MsColumnValueVO msColumnValueVO); + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/impl/DeptIdentifyServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/impl/DeptIdentifyServiceImpl.java new file mode 100644 index 0000000..5c659f0 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/dept/impl/DeptIdentifyServiceImpl.java @@ -0,0 +1,655 @@ +package com.ruoyi.wisdomarbitrate.service.dept.impl; + +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.google.gson.Gson; +import com.google.gson.JsonObject; +import com.ruoyi.common.config.RuoYiConfig; +import com.ruoyi.common.constant.FileTransformation; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.EsignHttpResponse; +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.exception.EsignDemoException; +import com.ruoyi.common.exception.ServiceException; +import com.ruoyi.common.utils.SealUtil; +import com.ruoyi.common.utils.file.FileUploadUtils; +import com.ruoyi.system.mapper.SysDeptMapper; +import com.ruoyi.system.mapper.SysDictDataMapper; +import com.ruoyi.system.mapper.SysUserMapper; +import com.ruoyi.system.mapper.SysUserPostMapper; +import com.ruoyi.wisdomarbitrate.domain.dto.dept.SealManage; +import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseAttach; +import com.ruoyi.wisdomarbitrate.domain.dto.dept.DeptIdentify; +import com.ruoyi.wisdomarbitrate.domain.dto.template.FatchRule; +import com.ruoyi.wisdomarbitrate.domain.dto.template.TemplateManage; +import com.ruoyi.wisdomarbitrate.domain.vo.template.TemplateFatchRule; +import com.ruoyi.wisdomarbitrate.mapper.dept.DeptIdentifyMapper; +import com.ruoyi.wisdomarbitrate.mapper.dept.SealManageMapper; +import com.ruoyi.wisdomarbitrate.mapper.mscase.MsCaseAttachMapper; +import com.ruoyi.wisdomarbitrate.mapper.template.FatchRuleMapper; +import com.ruoyi.wisdomarbitrate.mapper.template.TemplateManageMapper; +import com.ruoyi.wisdomarbitrate.service.dept.IDeptIdentifyService; +import com.ruoyi.wisdomarbitrate.utils.SignAward; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import com.ruoyi.wisdomarbitrate.mapper.template.TemplateFatchRuleMapper; + +import java.io.File; +import java.io.IOException; +import java.time.LocalDate; +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static com.ruoyi.common.utils.PageUtils.startPage; +import static com.ruoyi.common.utils.SecurityUtils.getUsername; + +@Service +public class DeptIdentifyServiceImpl implements IDeptIdentifyService { + + @Autowired + private DeptIdentifyMapper deptIdentifyMapper; + @Autowired + private MsCaseAttachMapper msCaseAttachMapper; + @Autowired + private SealManageMapper sealManageMapper; + @Autowired + private SysDeptMapper sysDeptMapper; + @Autowired + private SysUserMapper sysUserMapper; + @Autowired + private TemplateManageMapper templateManageMapper; + @Autowired + private SysUserPostMapper sysUserPostMapper; + @Autowired + private TemplateFatchRuleMapper templateFatchRuleMapper; + @Autowired + private FatchRuleMapper fatchRuleMapper; + @Autowired + private SysDictDataMapper dictDataMapper; + + + @Override + @Transactional + public List selectDeptIdentify(DeptIdentify deptIdentify) { + return deptIdentifyMapper.selectDeptIdentify(deptIdentify); + } + + @Override + @Transactional + public DeptIdentify selectDeptIndefiUrl(DeptIdentify deptIdentify) throws EsignDemoException { + List deptIdentifysnew = deptIdentifyMapper.selectDeptIdentify(deptIdentify); + DeptIdentify deptIdentifynew = new DeptIdentify(); + if (deptIdentifysnew != null && deptIdentifysnew.size() > 0) { + Gson gson = new Gson(); + DeptIdentify deptIdentifyselect = deptIdentifysnew.get(0); + EsignHttpResponse identifyUrl = SignAward.deptIdentifyUrl(deptIdentifyselect); + JsonObject signUrlJsonObject = gson.fromJson(identifyUrl.getBody(), JsonObject.class); + int code = signUrlJsonObject.get("code").getAsInt(); + if (code == 0) { + JsonObject signUrlData = signUrlJsonObject.getAsJsonObject("data"); + String url = signUrlData.get("authUrl").getAsString(); + //获取本次认证授权流程ID + String authFlowId = signUrlData.get("authFlowId").getAsString(); + deptIdentify.setAuthFlowId(authFlowId); + deptIdentifynew.setIdentifyUrl(url); + deptIdentify.setIdentifyDate(new Date()); + int row = deptIdentifyMapper.updateDeptIdentify(deptIdentify); + } + } + return deptIdentifynew; + } + + @Override + @Transactional + public AjaxResult enableDept(DeptIdentify deptIdentify) { + //参数校验 + if (deptIdentify.getId() == null) { + return AjaxResult.error("请检查参数"); + } + List deptIdentifysnew = deptIdentifyMapper.selectDeptIdentify(deptIdentify); + DeptIdentify deptIdentifyselect = deptIdentifysnew.get(0); + Integer identifyStatus = deptIdentifyselect.getIdentifyStatus(); + if (identifyStatus != 1) { + return AjaxResult.error("这个认证数据未进行认证，不能启用"); + } + deptIdentifyselect.setIsUse(1); + int i = deptIdentifyMapper.updateDeptIdentify(deptIdentifyselect); + if (i > 0) { + //把其他认证数据置为未使用 + DeptIdentify deptIdentify2 = new DeptIdentify(); + deptIdentify2.setIsUse(1); + List deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentify2); + for (DeptIdentify deptIdentify3 : deptIdentifies) { + if (deptIdentify3.equals(deptIdentifyselect)) { + continue; + } + deptIdentify3.setIsUse(0); + deptIdentifyMapper.updateDeptIdentify(deptIdentify3); + } + return AjaxResult.success("启用成功"); + } + + + return AjaxResult.error(); + } + + @Override + public AjaxResult sealUpload(Long id, String sealName, MultipartFile file) { + try { + if (file.isEmpty()) { + return AjaxResult.error("请选择要上传的文件"); + } + String filePath = RuoYiConfig.getUploadPath(); + // 上传 + String fileName = FileUploadUtils.upload(filePath, file); + DeptIdentify deptIdentify = new DeptIdentify(); + deptIdentify.setId(id); + List deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentify); + if (deptIdentifies != null && deptIdentifies.size() > 0) { + for (DeptIdentify identify : deptIdentifies) { + //先判断企业用户是否授予资源管理权限 + String authFlowId = identify.getAuthFlowId(); + if (authFlowId == null) { + return AjaxResult.error("改机构尚未认证,不能上传自定义公章"); + } + EsignHttpResponse response1 = SealUtil.queryAuthProcess(authFlowId); + JSONObject jsonObject1 = JSONObject.parseObject(response1.getBody()); + int authorizedStatus = jsonObject1.getJSONObject("data").getIntValue("authorizedStatus"); + if (authorizedStatus == 1) {//授权流程状态 0流程过期失效 1已授权 2授权中 3审批未通过 + String prefix = "/profile"; + int startIndex = fileName.indexOf(prefix); + startIndex += prefix.length(); + String annexPath = "home/ruoyi/uploadPath" + fileName.substring(startIndex); + //创建机构图片印章 + //String annexPath = "D:\\develop\\2.jpg"; + + EsignHttpResponse response = SignAward.createOrgByImage(identify, sealName, annexPath); + JSONObject jsonObject = JSONObject.parseObject(response.getBody()); + int code = jsonObject.getIntValue("code"); + if (code == 0) { //业务码，0表示成功，非0表示异常。 + String sealId = jsonObject.getJSONObject("data").getString("sealId"); + //保存到表里 + SealManage sealManage = new SealManage(); + sealManage.setIdentifyId(identify.getId()); + sealManage.setSealName(sealName); + sealManage.setSealId(sealId); + sealManage.setSealStatus(0); //默认为未审核 + sealManage.setIsUse(0); //默认为禁用 + int i = sealManageMapper.insertSealManage(sealManage); + if (i > 0) { + return AjaxResult.success("上传成功"); + } + } + return AjaxResult.error(jsonObject.getString("message")); + } + return AjaxResult.error("企业用户未授予资源管理权限"); + } + } + } catch (IOException e) { + e.printStackTrace(); + } catch (EsignDemoException e) { + e.printStackTrace(); + } + return AjaxResult.error(); + } + + @Override + public AjaxResult receiveNotify(String body) { + /* 请求Body数据格式如下： + { + "action":"SEAL_AUDIT", + "auditStatus":1, + "psnId":"c7e00294**41e7", + "rejectReason":"", + "sealBizType":"COMMON", + "sealId":"af80ba0f-xx-xx-xx-a2da292d7f7f", + "sealName":"赵四的图片印章", + "statusDescription":"通过" + }*/ + //解析body数据 + try { + JSONObject jsonObject = JSONObject.parseObject(body); + String action = jsonObject.getString("action"); + if (action.equals("SEAL_AUDIT")) { //SEAL_AUDIT表示图片印章审核结果通知 + String auditStatus = jsonObject.getString("auditStatus"); + if (auditStatus.equals("1")) { //图片印章审核结果 1通过 ，0驳回 + //审核通过,拿到印章id和机构账号ID + String orgId = jsonObject.getString("orgId"); + String sealId = jsonObject.getString("sealId"); + //查询指定印章详情（机构） + EsignHttpResponse response = SignAward.getOrgSeal(orgId, sealId); + JSONObject jsonObject1 = JSONObject.parseObject(response.getBody()); + if (jsonObject1.getIntValue("code") == 0) { //业务码，0表示成功，非0表示异常。 + int sealStatus = jsonObject1.getJSONObject("data").getIntValue("sealStatus"); + if (sealStatus == 1) { //印章状态 1已启用，2待审核，3审核不通过，4 挂起 + String sealImageDownloadUrl = jsonObject1.getString("sealImageDownloadUrl"); + LocalDate now = LocalDate.now(); + String year = Integer.toString(now.getYear()); + String month = String.format("%02d", now.getMonthValue()); + String day = String.format("%02d", now.getDayOfMonth()); + String saveFolderPath = "/home/ruoyi/uploadPath/upload/" + year + "/" + month + "/" + day; + String fileName = UUID.randomUUID().toString().replace("-", "") + ".pdf"; + String saveName = "/profile/upload/" + year + "/" + month + "/" + day + "/" + fileName; + String savePath = "/home/ruoyi/uploadPath/upload/"; + // 创建日期目录 + File saveFolder = new File(saveFolderPath); + if (!saveFolder.exists()) { + saveFolder.mkdirs(); + } + String resultFilePath = saveFolderPath + "/" + fileName; + File resultFilePathFile = new File(resultFilePath); + if (!resultFilePathFile.exists()) { + resultFilePathFile.createNewFile(); + } + boolean downLoadFile = FileTransformation.downLoadFileByUrl(sealImageDownloadUrl, resultFilePath); + if (downLoadFile) { + CaseAttach caseAttach = new CaseAttach(); + caseAttach.setAnnexType(10); //10代表印章图片 + caseAttach.setAnnexPath(savePath); + caseAttach.setAnnexName(saveName); + int i1 = msCaseAttachMapper.save(caseAttach); + if (i1 > 0) { + //将附件id保存到公章管理表里 + Integer annexId1 = caseAttach.getAnnexId(); + SealManage sealManage = new SealManage(); + sealManage.setSealId(sealId); + List selectSealList = sealManageMapper.selectSealList(sealManage); + if (selectSealList != null && selectSealList.size() > 0) { + SealManage sealManage1 = selectSealList.get(0); + sealManage1.setAnnexId(annexId1); + sealManage1.setSealStatus(1); //启用 + sealManageMapper.updateSealManage(sealManage1); + } + } + } + } + } + } + } + } catch (EsignDemoException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + return new AjaxResult(200, "success"); + } + + @Override + public List getSealList(DeptIdentify deptIdentify) { + if (deptIdentify.getId() == null) { + return null; + } + SealManage sealManage = new SealManage(); + sealManage.setIdentifyId(deptIdentify.getId()); + List selectSealList = sealManageMapper.selectSealList(sealManage); + if (selectSealList != null && selectSealList.size() > 0) { + for (SealManage sealManage1 : selectSealList) { + Integer annexId = sealManage1.getAnnexId(); + if (annexId != null) { + //根据附件id查询路径 + CaseAttach caseAttach = msCaseAttachMapper.queryAnnexById(annexId); + String annexName = caseAttach.getAnnexName(); + String prefix = "/profile"; + int startIndex = annexName.indexOf(prefix); + startIndex += prefix.length(); + String annexPath = "/uploadPath" + annexName.substring(startIndex); + sealManage1.setAnnexPath(annexPath); + } else { + sealManage1.setAnnexPath(null); + } + } + } + return selectSealList; + } + + @Override + public AjaxResult updateSealLockStatus(SealManage sealManage) { + sealManageMapper.updateSealManage(sealManage); + return AjaxResult.success(); + } + + @Override + public AjaxResult insertDeptIdentify(DeptIdentify deptIdentify) { + //参数校验 + String identifyName = deptIdentify.getIdentifyName(); + if (identifyName == null) { + AjaxResult.error("请检查参数是否完整"); + } + Integer identifyType = deptIdentify.getIdentifyType(); + if (identifyType == null) { + deptIdentify.setIdentifyType(1); // 设置机构默认为仲裁机构 + } + deptIdentify.setIdentifyStatus(0); //设置认证状态默认为未认证 + deptIdentify.setIsUse(0); //设置机构默认为未启用 + //将机构名称保存到部门表里 + SysDept sysDept = new SysDept(); + sysDept.setDeptName(identifyName); + sysDept.setParentId(0L); + sysDept.setDeptType(1); + int i1 = sysDeptMapper.insertDept(sysDept); + if (i1 > 0) { + /* //将经办人信息存入到用户表里 + Long deptId = sysDept.getDeptId(); + SysUser sysUser = new SysUser(); + sysUser.setDeptId(deptId); + sysUser.setUserName(deptIdentify.getOperUserName()); + sysUser.setNickName(operName); + sysUser.setPhonenumber(operPhone); + SysUser sysUser1 = sysUserMapper.selectUserByUserName(deptIdentify.getOperUserName()); + if (sysUser1== null) { + sysUserMapper.insertUser(sysUser); + } + Long userId = sysUser.getUserId(); + deptIdentify.setDeptId(deptId); + deptIdentify.setUserId(userId); + List sysUserPosts = new ArrayList<>(); + SysUserPost sysUserPost = new SysUserPost(); + sysUserPost.setUserId(userId); + sysUserPost.setPostId(5L); + sysUserPosts.add(sysUserPost); + sysUserPostMapper.batchUserPost(sysUserPosts);*/ + Long deptId = sysDept.getDeptId(); + deptIdentify.setDeptId(deptId); + } + + int i = deptIdentifyMapper.insertDeptIdentify(deptIdentify); + if (i > 0) { + return AjaxResult.success("新增成功"); + } + return AjaxResult.error(); + } + + @Override + public AjaxResult deleteDeptIdentify(Long id) { + DeptIdentify deptIdentify = new DeptIdentify(); + deptIdentify.setId(id); + deptIdentify.setDelFlag(2); + int i = deptIdentifyMapper.updateDeptIdentify(deptIdentify); + if (i > 0) { + //删除部门表数据 + sysDeptMapper.deleteDeptById(id); + return AjaxResult.success("删除成功"); + } + return AjaxResult.error(); + } + + @Override + public AjaxResult updateDeptIdentify(DeptIdentify deptIdentify) { + Long id = deptIdentify.getId(); + if (id == null) { + return AjaxResult.error(); + } + DeptIdentify deptIdentifyNew = new DeptIdentify(); + deptIdentifyNew.setId(id); + List deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentifyNew); + if (deptIdentifies != null && deptIdentifies.size() > 0) { + DeptIdentify deptIdentify1 = deptIdentifies.get(0); + if (deptIdentify1.getIdentifyStatus() == 1) { + return AjaxResult.error("已认证的机构不允许修改"); + } + int i = deptIdentifyMapper.updateDeptIdentify(deptIdentify); + if (i > 0) { + //修改部门表数据 + SysDept sysDept = new SysDept(); + sysDept.setDeptId(deptIdentify1.getDeptId()); + sysDept.setDeptName(deptIdentify.getIdentifyName()); + sysDeptMapper.updateDept(sysDept); + return AjaxResult.success("修改成功"); + } + } + + return null; + } + + @Override + public AjaxResult insertTemplate(TemplateManage templateManage, MultipartFile file) { + //参数校验 + if (templateManage.getIdentifyId() == null || file == null || templateManage.getTemName() == null) { + return AjaxResult.error("请检查参数是否完整"); + } + if (templateManage.getTemType() == null) { + templateManage.setTemType(1); //默认模板类型为1(裁决书) + } + try { + String filePath = RuoYiConfig.getUploadPath(); + // 上传 + String fileName = FileUploadUtils.upload(filePath, file); + String prefix = "/profile"; + int startIndex = fileName.indexOf(prefix); + startIndex += prefix.length(); + String annexPath = "uploadPath" + fileName.substring(startIndex); + templateManage.setTemOrigPath(annexPath); + String format = getFileExtension(fileName); + templateManage.setTemFormat(format); + String subFileName = fileName.substring(fileName.lastIndexOf("/") + 1); + templateManage.setFileName(subFileName); + templateManage.setCreateBy(getUsername()); + int i = templateManageMapper.insertTemplateManage(templateManage); + if (i > 0) { + return AjaxResult.success("新增成功"); + } + } catch (IOException e) { + e.printStackTrace(); + } + return null; + } + + @Override + public AjaxResult updateTemplate(TemplateManage templateManage, MultipartFile file) { + Long id = templateManage.getId(); + if (id == null) { + return AjaxResult.error(); + } + try { + if (file != null && file.getSize() > 0) { + String filePath = RuoYiConfig.getUploadPath(); + // 上传 + String fileName = FileUploadUtils.upload(filePath, file); + String prefix = "/profile"; + int startIndex = fileName.indexOf(prefix); + startIndex += prefix.length(); + String annexPath = "uploadPath" + fileName.substring(startIndex); + templateManage.setTemOrigPath(annexPath); + String subFileName = fileName.substring(fileName.lastIndexOf("/") + 1); + templateManage.setFileName(subFileName); + String format = getFileExtension(fileName); + templateManage.setTemFormat(format); + } + templateManage.setUpdateBy(getUsername()); + int i = templateManageMapper.updateTemplateManage(templateManage); + if (i > 0) { + return AjaxResult.success("修改成功"); + } + } catch (IOException e) { + e.printStackTrace(); + } + return AjaxResult.error(); + } + + @Override + public AjaxResult deleteTemplate(Long id) { + TemplateManage templateManage = new TemplateManage(); + templateManage.setId(id); + templateManage.setDelFlag(2); + int i = templateManageMapper.updateTemplateManage(templateManage); + if (i > 0) { + return AjaxResult.success("删除成功"); + } + return AjaxResult.error(); + } + + @Override + public List getTemplateList(DeptIdentify deptIdentify) { + TemplateManage templateManage = new TemplateManage(); + templateManage.setIdentifyId(deptIdentify.getId()); + List templateManages = templateManageMapper.selectTemplateList(templateManage); + if (templateManages != null && templateManages.size() > 0) { + for (TemplateManage manage : templateManages) { + //根据机构id查询机构名称 + Long identifyId = manage.getIdentifyId(); + if (identifyId != null) { + deptIdentify.setId(identifyId); + List deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentify); + if (deptIdentifies != null && deptIdentifies.size() > 0) { + manage.setIdentifyName(deptIdentifies.get(0).getIdentifyName()); + } + } + } + } + return templateManages; + } + + @Override + public List selectPostUserByDeptId(DeptIdentify deptIdentify) { + List deptIdentifies = deptIdentifyMapper.selectDeptIdentify(deptIdentify); + if (deptIdentifies != null && deptIdentifies.size() > 0) { + deptIdentify = deptIdentifies.get(0); + if (deptIdentify.getDeptId() != null) { + //默认查询经办人的 + Long roleId = 106L; + List sysUserList = sysUserMapper.selectRoleUserByDeptId(deptIdentify.getDeptId(), roleId); + return sysUserList; + } + + } + return null; + } + + @Override + public AjaxResult bindHandler(DeptIdentify deptIdentify) { + if (deptIdentify.getId() == null || deptIdentify.getUserId() == null) { + return AjaxResult.error("请检查参数是否完整"); + } + //根据userid查询用户信息 + SysUser sysUser = sysUserMapper.selectUserById(deptIdentify.getUserId()); + if (sysUser != null) { + deptIdentify.setOperName(sysUser.getNickName()); + deptIdentify.setOperPhone(sysUser.getPhonenumber()); + deptIdentify.setOperUserName(sysUser.getUserName()); + deptIdentify.setUserId(deptIdentify.getUserId()); + //更新 + int i = deptIdentifyMapper.updateDeptIdentify(deptIdentify); + if (i > 0) { + return AjaxResult.success("绑定成功"); + } + } + return null; + } + + @Override + public List getFatchRuleByTemplateid(TemplateManage templateManage) { + + FatchRule fatchRule = new FatchRule(); + fatchRule.setTemplateId(templateManage.getId()); + return fatchRuleMapper.selectFatchRuleList(fatchRule); + + } + + @Override + @Transactional + public AjaxResult saveFatchRules(TemplateManage templateManage) { + TemplateFatchRule templateFatchRule = new TemplateFatchRule(); + templateFatchRule.setTemplateId(templateManage.getId()); + templateFatchRuleMapper.deleteTemplateFatchRule(templateManage.getId()); + + List fatchRules = templateManage.getFatchRules(); + + Map columnmap = fatchRules.stream().collect(Collectors.groupingBy(fatchRule -> fatchRule.getColumn(), Collectors.counting())); + Stream columnStream = columnmap.entrySet().stream().filter(entry -> entry.getValue() > 1).map(entry -> entry.getKey()); + List strlist1 = new ArrayList<>(); + columnStream.forEach(column -> { + strlist1.add(column.toString()); + }); + if(strlist1!=null&&strlist1.size()>0){ + throw new ServiceException("字段' " + String.join(",", strlist1) + " '重复"); + } + + Map columnNamemap = fatchRules.stream().collect(Collectors.groupingBy(fatchRule -> fatchRule.getColumnName(), Collectors.counting())); + Stream columnNameStream = columnNamemap.entrySet().stream().filter(entry -> entry.getValue() > 1).map(entry -> entry.getKey()); + List strlist2 = new ArrayList<>(); + columnNameStream.forEach(column -> { + strlist2.add(column.toString()); + }); + if(strlist2!=null&&strlist2.size()>0){ + throw new ServiceException("字段' " + String.join(",", strlist2) + " '重复"); + } + + if(fatchRules!=null&&fatchRules.size()>0){ + for (FatchRule fatchRule : fatchRules) { + //保存抓取规则数据 + fatchRuleMapper.insertFatchRule(fatchRule); + //保存模板抓取规则关联关系 + Long fatchRuleId = fatchRule.getId(); + if(fatchRuleId!=null){ + templateFatchRule.setFatchRuleId(fatchRuleId); + templateFatchRuleMapper.insertTemplateFatchRule(templateFatchRule); + } + } + return AjaxResult.success("新增成功"); + } + return AjaxResult.error(); + } + + @Override + public List selectColumnandComment() { + List fatchRules = new ArrayList<>(); + FatchRule fatchRuleselect = new FatchRule(); + fatchRuleselect.setDatabaseName("test_smart_arbitration"); + fatchRules = fatchRuleMapper.selectColumnandComment(fatchRuleselect); + return fatchRules; + } + + @Override + public FatchRule selectColumnbycomment(FatchRule fatchRule) { + fatchRule.setDatabaseName("test_smart_arbitration"); + FatchRule fatchRulesel = fatchRuleMapper.selectColumnbycomment(fatchRule); + return fatchRulesel; + } + + /** + * 根据模板id查询模板字段列表 + * @param templateManage + * @return + */ + @Override + public List getTemplateInfoById(TemplateManage templateManage) { + FatchRule fatchRule = new FatchRule(); + fatchRule.setTemplateId(templateManage.getId()); + List fatchRuleList = fatchRuleMapper.selectFatchRuleList(fatchRule); + if(CollectionUtil.isEmpty(fatchRuleList)){ + fatchRuleList=new ArrayList<>(); + } + List columnNameList = fatchRuleList.stream().map(FatchRule::getColumnName).collect(Collectors.toList()); + // 在系统表中查询案件内置字段 + SysDictData sysDictData = new SysDictData(); + sysDictData.setDictType("case_built_type"); + List dictDataList = dictDataMapper.selectDictDataList(sysDictData); + if(CollectionUtil.isNotEmpty(dictDataList)){ + for (SysDictData dictData : dictDataList) { + if(StrUtil.isEmpty(dictData.getDictLabel())||columnNameList.contains(dictData.getDictLabel())){ + continue; + } + FatchRule rule=new FatchRule(); + rule.setColumn(dictData.getDictValue()); + rule.setColumnName(dictData.getDictLabel()); + fatchRuleList.add(rule); + } + } + + return fatchRuleList; + } + + private String getFileExtension(String fileName) { + int lastDotIndex = fileName.lastIndexOf("."); + if (lastDotIndex > 0 && lastDotIndex < fileName.length() - 1) { + return fileName.substring(lastDotIndex + 1); + } + return ""; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/ICaseLogRecordService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/ICaseLogRecordService.java deleted file mode 100644 index bc8b80a..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/ICaseLogRecordService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.ruoyi.wisdomarbitrate.service.mscase; - -import com.ruoyi.wisdomarbitrate.domain.CaseApplication; -import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; - -import java.util.List; - -public interface ICaseLogRecordService { - - - List selectCaseLogRecordList(CaseLogRecord caseLogRecord); - - - - - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseLogRecordService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseLogRecordService.java new file mode 100644 index 0000000..6d71b0a --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/MsCaseLogRecordService.java @@ -0,0 +1,16 @@ +package com.ruoyi.wisdomarbitrate.service.mscase; + +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord; + +import java.util.List; + +public interface MsCaseLogRecordService { + + + List selectCaseLogRecordList(MsCaseLogRecord caseLogRecord); + + + + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/VideoService.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/VideoService.java index a89349e..19cae8d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/VideoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/VideoService.java @@ -1,7 +1,7 @@ package com.ruoyi.wisdomarbitrate.service.mscase; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.wisdomarbitrate.domain.vo.mscase.ReservedConferenceVO; +import com.ruoyi.wisdomarbitrate.domain.vo.mscase.MsReservedConferenceVO; import javax.servlet.http.HttpServletRequest; @@ -41,10 +41,10 @@ public interface VideoService { /** * 根据html字符串转pdf并和案件关联 - * @param reservedConferenceVO + * @param msReservedConferenceVO * @return */ - AjaxResult htmlToPDF(ReservedConferenceVO reservedConferenceVO); + AjaxResult htmlToPDF(MsReservedConferenceVO msReservedConferenceVO); /** * 根据案件id和类型查询附件 diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/CaseLogRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/CaseLogRecordServiceImpl.java deleted file mode 100644 index cc01476..0000000 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/CaseLogRecordServiceImpl.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.ruoyi.wisdomarbitrate.service.mscase.impl; - -import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DatePattern; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; -import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; -import com.ruoyi.wisdomarbitrate.mapper.mscase.CaseLogRecordMapper; -import com.ruoyi.wisdomarbitrate.service.mscase.ICaseLogRecordService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Optional; - -@Service -public class CaseLogRecordServiceImpl implements ICaseLogRecordService { - @Autowired - private CaseLogRecordMapper caseLogRecordMapper; - - - @Override - public List selectCaseLogRecordList(CaseLogRecord caseLogRecord) { - List records = caseLogRecordMapper.selectCaseLogRecordList(caseLogRecord); - if(CollectionUtil.isNotEmpty(records)){ - records.forEach(record->{ - StringBuilder contentBuilder = new StringBuilder(); - String caseNodeTime=""; - if(record.getCaseNodeTime()!=null){ - caseNodeTime= DateUtil.format(record.getCaseNodeTime(), DatePattern.NORM_DATETIME_FORMATTER); - } - - contentBuilder.append(Optional.ofNullable(record.getCreateNickName()).orElse("")).append("(").append(record.getCreateBy()).append(")").append("于").append(caseNodeTime); - if(StrUtil.isNotEmpty(record.getContent())){ - contentBuilder.append(record.getContent()); - } - if(StrUtil.isNotEmpty(record.getNotes())){ - contentBuilder.append("，").append(record.getNotes()); - } - record.setContent(contentBuilder.toString()); - - }); - } - return records; - } - - - - - -} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseLogRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseLogRecordServiceImpl.java new file mode 100644 index 0000000..1ab6997 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsCaseLogRecordServiceImpl.java @@ -0,0 +1,27 @@ +package com.ruoyi.wisdomarbitrate.service.mscase.impl; + +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord; +import com.ruoyi.wisdomarbitrate.mapper.mscase.MsCaseLogRecordMapper; +import com.ruoyi.wisdomarbitrate.service.mscase.MsCaseLogRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class MsCaseLogRecordServiceImpl implements MsCaseLogRecordService { + @Autowired + private MsCaseLogRecordMapper caseLogRecordMapper; + + + @Override + public List selectCaseLogRecordList(MsCaseLogRecord caseLogRecord) { + List records = caseLogRecordMapper.select(caseLogRecord); + return records; + } + + + + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java index fc03931..be08327 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/utils/CaseLogUtils.java @@ -5,12 +5,11 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.model.LoginUser; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.mapper.SysUserMapper; -import com.ruoyi.wisdomarbitrate.domain.dto.mscase.CaseLogRecord; -import com.ruoyi.wisdomarbitrate.mapper.mscase.CaseLogRecordMapper; +import com.ruoyi.wisdomarbitrate.domain.entity.mscase.MsCaseLogRecord; +import com.ruoyi.wisdomarbitrate.mapper.mscase.MsCaseLogRecordMapper; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import java.util.List; /** * 案件记录日志文件 @@ -19,7 +18,7 @@ import java.util.List; */ public class CaseLogUtils { - private static CaseLogRecordMapper caseLogRecordMapper= SpringUtil.getBean(CaseLogRecordMapper.class); + private static MsCaseLogRecordMapper caseLogRecordMapper= SpringUtil.getBean(MsCaseLogRecordMapper.class); private static SysUserMapper userMapper= SpringUtil.getBean(SysUserMapper.class); /** @@ -29,7 +28,7 @@ public class CaseLogUtils * @param notes 备注 */ public static void insertCaseLog(@NotNull Long caseAppliId, @NotEmpty Integer caseNode, String notes ){ - CaseLogRecord operLog = new CaseLogRecord(); + MsCaseLogRecord operLog = new MsCaseLogRecord(); // 获取当前的用户 LoginUser loginUser = SecurityUtils.getLoginUser(); if(loginUser!=null) { @@ -45,7 +44,7 @@ public class CaseLogUtils operLog.setCaseAppliId(caseAppliId); operLog.setCaseNode(caseNode); operLog.setNotes(notes); - caseLogRecordMapper.insertCaseLogRecord(operLog); + caseLogRecordMapper.insert(operLog); } /** * 新增案件日志 @@ -54,7 +53,7 @@ public class CaseLogUtils * @param notes 备注 */ public static void insertCaseLog(@NotNull Long caseAppliId, @NotEmpty Integer caseNode, String notes ,LoginUser loginUser ){ - CaseLogRecord operLog = new CaseLogRecord(); + MsCaseLogRecord operLog = new MsCaseLogRecord(); // 获取当前的用户 if(loginUser!=null) { SysUser sysUser = userMapper.selectUserById(loginUser.getUserId()); @@ -69,16 +68,6 @@ public class CaseLogUtils operLog.setCaseAppliId(caseAppliId); operLog.setCaseNode(caseNode); operLog.setNotes(notes); - caseLogRecordMapper.insertCaseLogRecord(operLog); + caseLogRecordMapper.insert(operLog); } - /** - * 批量新增案件日志 - * @param list - */ - public static void batchInsertCaseLog(List list ){ - - caseLogRecordMapper.batchInsertRecord(list); - } - - } diff --git a/ruoyi-system/src/main/resources/mapper/baseinfo/CountryMapper.xml b/ruoyi-system/src/main/resources/mapper/baseinfo/CountryMapper.xml deleted file mode 100644 index 490a703..0000000 --- a/ruoyi-system/src/main/resources/mapper/baseinfo/CountryMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/casestatus/MsCaseStatusMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/casestatus/MsCaseStatusMapper.xml new file mode 100644 index 0000000..39c8b16 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/casestatus/MsCaseStatusMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/casestatus/MsCaseStatusRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/casestatus/MsCaseStatusRoleMapper.xml new file mode 100644 index 0000000..ccc05c0 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/casestatus/MsCaseStatusRoleMapper.xml @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/dept/MsSealSignRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/dept/MsSealSignRecordMapper.xml new file mode 100644 index 0000000..d6f0af1 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/dept/MsSealSignRecordMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseLogRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseLogRecordMapper.xml deleted file mode 100644 index c5d8283..0000000 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseLogRecordMapper.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - - - - - - - - insert into ms_case_log_record(case_appli_id, case_node,case_node_time,notes,create_by,create_nick_name,create_time,update_by,update_time ) values( - #{caseAppliId},#{caseNode},sysdate(),#{notes},#{createBy},#{createNickName},sysdate(),#{updateBy},sysdate() - ) - - - insert into ms_case_log_record(case_appli_id, case_node,case_node_time,notes,create_by,create_nick_name,create_time,update_by,update_time ) values - - ( - #{item.caseAppliId},#{item.caseNode},sysdate(),#{item.notes},#{item.createBy},#{item.createNickName},sysdate(),#{item.updateBy},sysdate() - ) - - - - - - \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateLogMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateLogMapper.xml new file mode 100644 index 0000000..bc5406f --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateLogMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateMapper.xml new file mode 100644 index 0000000..1d4e350 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAffiliateMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationLogMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationLogMapper.xml new file mode 100644 index 0000000..974e76b --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationLogMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml new file mode 100644 index 0000000..7a924d8 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseApplicationMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseAttachLogMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAttachLogMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseAttachLogMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAttachLogMapper.xml index 436f0dc..ecdd44e 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseAttachLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAttachLogMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseAttachMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAttachMapper.xml similarity index 98% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseAttachMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAttachMapper.xml index ae73ba7..031424d 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/CaseAttachMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseAttachMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseLogRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseLogRecordMapper.xml new file mode 100644 index 0000000..f101e21 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsCaseLogRecordMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueLogMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsColumnValueLogMapper.xml similarity index 87% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueLogMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsColumnValueLogMapper.xml index b4a7aff..49e4311 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsColumnValueLogMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -33,7 +33,7 @@ where `COLUMN`=#{item.column} and `NAME`=#{item.name} and case_appli_log_id=#{item.caseAppliLogId}; - select * from ms_column_value_log c diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsColumnValueMapper.xml similarity index 83% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsColumnValueMapper.xml index e582551..52a4e6b 100644 --- a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ColumnValueMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsColumnValueMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -31,7 +31,7 @@ - + update ms_column_value @@ -45,7 +45,7 @@ select * from ms_column_value where case_id=#{caseId} - select * from ms_column_value c diff --git a/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ReservedConferenceMapper.xml b/ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsReservedConferenceMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/ReservedConferenceMapper.xml rename to ruoyi-system/src/main/resources/mapper/wisdomarbitrate/mscase/MsReservedConferenceMapper.xml